diff --git a/.gitignore b/.gitignore
index 9da4d972909ecdc0cd5661e4b687f69a139167c4..fe89c74ab38864939d737fa40f8ff0671e5c6372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,10 @@ apps/*
 !apps/user_ldap
 !apps/user_webdavauth
 
+# ignore themes except the README
+themes/*
+!themes/README
+
 # just sane ignores
 .*.sw[po]
 *.bak
@@ -72,4 +76,4 @@ nbproject
 data-autotest
 /tests/coverage*
 /tests/autoconfig*
-/tests/autotest*
+/tests/autotest*
\ No newline at end of file
diff --git a/.htaccess b/.htaccess
index 463b49993e6062ebdb2bb805944bdf6280a09951..08e2a82facbfc2a80ef95eb21a3533de1136bc3f 100755
--- a/.htaccess
+++ b/.htaccess
@@ -12,6 +12,7 @@ ErrorDocument 404 /core/templates/404.php
 php_value upload_max_filesize 513M
 php_value post_max_size 513M
 php_value memory_limit 512M
+php_value mbstring.func_overload 0
 <IfModule env_module>
   SetEnv htaccessWorking true
 </IfModule>
@@ -32,5 +33,8 @@ RewriteRule ^remote/(.*) remote.php [QSA,L]
 AddType image/svg+xml svg svgz
 AddEncoding gzip svgz
 </IfModule>
+<IfModule dir_module>
+DirectoryIndex index.php index.html
+</IfModule>
 AddDefaultCharset utf-8
 Options -Indexes
diff --git a/3rdparty b/3rdparty
index a13af72fbe8983686fc47489a750e60319f68ac2..e312294ef62873df2b8c02e774f9dfe1b7fbc38d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
+Subproject commit e312294ef62873df2b8c02e774f9dfe1b7fbc38d
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1de46ac8b80acf0049dd0f107a807013a658acb7..fd87513ec2a86c870ace782ab9ec8282a1017307 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,13 +3,21 @@
 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].
 
 ### 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: 
   - [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)
-  - [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar, Contacts...)
-* Search the existing issues first, it's likely that your issue was already reported.
+  - Apps:
+      - [Bookmarks](https://github.com/owncloud/bookmarks/issues)
+      - [Calendar](https://github.com/owncloud/calendar/issues)
+      - [Contacts](https://github.com/owncloud/contacts/issues)
+      - [Mail](https://github.com/owncloud/mail/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.
 
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index da7e9d6b2aa2858b4be3e9db49ed09ab4fc19f2f..5f4856ec790a64f8dc52f6bb86b42266945afe5d 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -8,7 +8,7 @@ OCP\JSON::callCheck();
 
 // Get data
 $dir = stripslashes($_POST["dir"]);
-$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);
+$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
 
 $files = json_decode($files);
 $filesWithError = '';
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 38714f34a639fa5bc8a9aa4a00c69833b23e20ad..8548fc95ddf963d6ef131b8b94fa808a5d547e21 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -85,7 +85,7 @@ if($source) {
 	}elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) {
 		$meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename);
 		$id = $meta['fileid'];
-		OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id)));
+		OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype'])));
 		exit();
 	}
 }
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 1cd2944483cb337e547296224881252ebd4fc9d2..f568afad4da44f87f4d74cd301cee93202c8aa9b 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -15,6 +15,14 @@ $mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
 
 // make filelist
 $files = array();
+// If a type other than directory is requested first load them.
+if($mimetype && strpos($mimetype, 'httpd/unix-directory') === false) {
+	foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $i ) {
+		$i["date"] = OCP\Util::formatDate($i["mtime"] );
+		$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
+		$files[] = $i;
+	}
+}
 foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $i ) {
 	$i["date"] = OCP\Util::formatDate($i["mtime"] );
 	$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 9fd2ce3ad4bc6d548aeb3a609e45863707ea7df7..f4551858283a21adb152160339bea773dc938113 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -1,26 +1,41 @@
 <?php
 
-// Init owncloud
-
+/**
+ * ownCloud - Core
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-// Get data
-$dir = stripslashes($_GET["dir"]);
-$file = stripslashes($_GET["file"]);
-$newname = stripslashes($_GET["newname"]);
-
-$l = OC_L10N::get('files');
+$files = new \OCA\Files\App(
+	\OC\Files\Filesystem::getView(),
+	\OC_L10n::get('files')
+);
+$result = $files->rename(
+	$_GET["dir"],
+	$_GET["file"],
+	$_GET["newname"]
+);
 
-if ( $newname !== '.' and ($dir != '' || $file != 'Shared') and $newname !== '.') {
-	$targetFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $newname);
-	$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
-	if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
-		OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname )));
-	} else {
-		OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
-	}
-}else{
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") )));
-}
+if($result['success'] === true){
+	OCP\JSON::success(array('data' => $result['data']));
+} else {
+	OCP\JSON::error(array('data' => $result['data']));
+}
\ No newline at end of file
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 6535a9b7baa39023f8ed10278898aea778d8fd4e..99739cb4cee71461bf43d1a6f0e8143b7e8939a4 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -12,3 +12,12 @@ OCP\App::addNavigationEntry( array( "id" => "files_index",
 									"name" => $l->t("Files") ));
 
 OC_Search::registerProvider('OC_Search_Provider_File');
+
+// cache hooks must be connected before all other apps.
+// since 'files' is always loaded first the hooks need to be connected here
+\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
+\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
+\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
+\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
+
+\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index ec323915b4431a6b67b979f0f2b863a39fc61557..f788949b1b62feb82a07a8d6eb3f733f2a0f846e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -5,7 +5,8 @@
 /* FILE MENU */
 .actions { padding:.3em; height:2em; width: 100%; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
-
+.actions .button a { color: #555; }
+.actions .button a:hover, .actions .button a:active { color: #333; }
 #new {
 	height:17px;  margin:0 0 0 1em; z-index:1010; float:left;
 }
@@ -34,6 +35,7 @@
 	background-image:url('%webroot%/core/img/actions/upload.svg');
 	background-repeat:no-repeat;
 	background-position:7px 6px;
+	opacity:0.65;
 }
 .file_upload_target { display:none; }
 .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
@@ -148,7 +150,7 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
-div.crumb a{ padding:0.9em 0 0.7em 0; }
+div.crumb a{ padding:0.9em 0 0.7em 0; color:#555; }
 
 table.dragshadow {
 	width:auto;
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index f3264da5a127cd221153602ac18b744f63db442c..14fca6f14829cfab7344d06af04115e22634a481 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -22,18 +22,18 @@ var FileActions = {
 		if (FileActions.actions.all) {
 			actions = $.extend(actions, FileActions.actions.all);
 		}
-		if (mime) {
-			if (FileActions.actions[mime]) {
-				actions = $.extend(actions, FileActions.actions[mime]);
+		if (type) {//type is 'dir' or 'file'
+			if (FileActions.actions[type]) {
+				actions = $.extend(actions, FileActions.actions[type]);
 			}
+		}
+		if (mime) {
 			var mimePart = mime.substr(0, mime.indexOf('/'));
 			if (FileActions.actions[mimePart]) {
 				actions = $.extend(actions, FileActions.actions[mimePart]);
 			}
-		}
-		if (type) {//type is 'dir' or 'file'
-			if (FileActions.actions[type]) {
-				actions = $.extend(actions, FileActions.actions[type]);
+			if (FileActions.actions[mime]) {
+				actions = $.extend(actions, FileActions.actions[mime]);
 			}
 		}
 		var filteredActions = {};
@@ -113,6 +113,7 @@ var FileActions = {
 			}
 		});
 		if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){
+			// t('files', 'Share')
 			addAction('Share', actions.Share);
 		}
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 70c3332ccaf885c251a5ab0e4f5ab5fd57bbed7d..c24d1fd8244dd124d781e41f140cae700b6bb528 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -191,6 +191,13 @@ var FileList={
 		td.children('a.name').hide();
 		td.append(form);
 		input.focus();
+		//preselect input
+		var len = input.val().lastIndexOf('.');
+		if (len === -1) {
+			len = input.val().length;
+		}
+		input.selectRange(0,len);
+		
 		form.submit(function(event){
 			event.stopPropagation();
 			event.preventDefault();
@@ -320,9 +327,9 @@ var FileList={
 		}
 		for (var i=0; i<files.length; i++) {
 			var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
-			var oldHTML = deleteAction[0].outerHTML;
+			var oldHTML = deleteAction.html();
 			var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
-			deleteAction[0].outerHTML = newHTML;
+			deleteAction.html(newHTML);
 		}
 		// Finish any existing actions
 		if (FileList.lastAction) {
@@ -344,7 +351,7 @@ var FileList={
 					} else {
 						$.each(files,function(index,file) {
 							var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
-							deleteAction[0].outerHTML = oldHTML;
+							deleteAction.html(oldHTML);
 						});
 					}
 				});
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 7e3caf71a03ce52fc79c081fc134e7d7a31e771d..a79d34c9b23545ce3b9d042b0ebd529bd99a19a3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -115,6 +115,11 @@ $(document).ready(function() {
 		return false;
 	});
 
+	// Trigger cancelling of file upload
+	$('#uploadprogresswrapper .stop').on('click', function() {
+		Files.cancelUploads();
+	});
+
 	// Show trash bin
 	$('#trash a').live('click', function() {
 		window.location=OC.filePath('files_trashbin', '', 'index.php');
@@ -506,9 +511,9 @@ $(document).ready(function() {
 								var date=new Date();
 								FileList.addFile(name,0,date,false,hidden);
 								var tr=$('tr').filterAttr('data-file',name);
-								tr.attr('data-mime','text/plain');
+								tr.attr('data-mime',result.data.mime);
 								tr.attr('data-id', result.data.id);
-								getMimeIcon('text/plain',function(path){
+								getMimeIcon(result.data.mime,function(path){
 									tr.find('td.filename').attr('style','background-image:url('+path+')');
 								});
 							} else {
@@ -703,14 +708,14 @@ function scanFiles(force, dir){
 	var 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')
+		console.log(count + ' files scanned')
 	});
 	scannerEventSource.listen('folder',function(path){
 		console.log('now scanning ' + path)
 	});
 	scannerEventSource.listen('done',function(count){
 		scanFiles.scanning=false;
-		console.log('done after ' + count + 'files');
+		console.log('done after ' + count + ' files');
 	});
 }
 scanFiles.scanning=false;
@@ -757,9 +762,9 @@ var createDragShadow = function(event){
 	var dir=$('#dir').val();
 
 	$(selectedFiles).each(function(i,elem){
-		var newtr = $('<tr data-dir="'+dir+'" data-filename="'+elem.name+'">'
-						+'<td class="filename">'+elem.name+'</td><td class="size">'+humanFileSize(elem.size)+'</td>'
-					 +'</tr>');
+		var newtr = $('<tr/>').attr('data-dir', dir).attr('data-filename', elem.name);
+		newtr.append($('<td/>').addClass('filename').text(elem.name));
+		newtr.append($('<td/>').addClass('size').text(humanFileSize(elem.size)));
 		tbody.append(newtr);
 		if (elem.type === 'dir') {
 			newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')');
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 41e6a225a2b745a9ca7021306b51e48542a515e7..ca198b7efe95a31501f411f6f7d644addd3c0b54 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
 "Could not move %s" => "فشل في نقل %s",
-"Unable to rename file" => "فشل في اعادة تسمية الملف",
 "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 ",
@@ -13,8 +12,9 @@
 "Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
 "Invalid directory." => "مسار غير صحيح.",
 "Files" => "الملفات",
+"Share" => "شارك",
 "Delete permanently" => "حذف بشكل دائم",
-"Delete" => "محذوف",
+"Delete" => "إلغاء",
 "Rename" => "إعادة تسميه",
 "Pending" => "قيد الانتظار",
 "{new_name} already exists" => "{new_name} موجود مسبقا",
@@ -37,14 +37,15 @@
 "URL cannot be empty." => "عنوان ال URL  لا يجوز أن يكون فارغا.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام",
 "Error" => "خطأ",
-"Name" => "الاسم",
+"Name" => "اسم",
 "Size" => "حجم",
 "Modified" => "معدل",
 "1 folder" => "مجلد عدد 1",
 "{count} folders" => "{count} مجلدات",
 "1 file" => "ملف واحد",
 "{count} files" => "{count} ملفات",
-"Upload" => "إرفع",
+"Unable to rename file" => "فشل في اعادة تسمية الملف",
+"Upload" => "رفع",
 "File handling" => "التعامل مع الملف",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
 "max. possible: " => "الحد الأقصى المسموح به",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index c4bbca36f47b830fe0d3a4e39271f2185583dd64..661bb5718aea16680b2b61b4c9efa8aaafb42dd0 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -1,8 +1,13 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Файлът е качен успешно",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
+"The uploaded file was only partially uploaded" => "Файлът е качен частично",
+"No file was uploaded" => "Фахлът не бе качен",
 "Missing a temporary folder" => "Липсва временна папка",
 "Failed to write to disk" => "Възникна проблем при запис в диска",
 "Invalid directory." => "Невалидна директория.",
 "Files" => "Файлове",
+"Share" => "Споделяне",
 "Delete permanently" => "Изтриване завинаги",
 "Delete" => "Изтриване",
 "Rename" => "Преименуване",
@@ -29,5 +34,7 @@
 "Cancel upload" => "Спри качването",
 "Nothing in here. Upload something!" => "Няма нищо тук. Качете нещо.",
 "Download" => "Изтегляне",
-"Upload too large" => "Файлът който сте избрали за качване е прекалено голям"
+"Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
+"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
 );
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index 640430716fe3b3a7dab2f94af55316d98b1cfb53..83dd4dc36dc2a73e84bb1aad4a0013953e4a6e34 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s কে স্থানান্তর করা সম্ভব হলো না -  এই নামের ফাইল বিদ্যমান",
 "Could not move %s" => "%s  কে স্থানান্তর করা সম্ভব হলো না",
-"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
-"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যা অজ্ঞাত।",
-"There is no error, the file uploaded with success" => "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে",
+"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: " => "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি HTML  ফর্মে নির্ধারিত  MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি  HTML  ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার  অতিক্রম করতে চলেছে ",
 "The uploaded file was only partially uploaded" => "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে",
 "No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
-"Missing a temporary folder" => "অস্থায়ী ফোল্ডার খোয়া গিয়েছে",
+"Missing a temporary folder" => "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে",
 "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
 "Invalid directory." => "ভুল ডিরেক্টরি",
 "Files" => "ফাইল",
-"Delete" => "মুছে ফেল",
+"Share" => "ভাগাভাগি কর",
+"Delete" => "মুছে",
 "Rename" => "পূনঃনামকরণ",
 "Pending" => "মুলতুবি",
 "{new_name} already exists" => "{new_name} টি বিদ্যমান",
@@ -32,13 +32,14 @@
 "URL cannot be empty." => "URL ফাঁকা রাখা যাবে না।",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।",
 "Error" => "সমস্যা",
-"Name" => "নাম",
+"Name" => "রাম",
 "Size" => "আকার",
 "Modified" => "পরিবর্তিত",
 "1 folder" => "১টি ফোল্ডার",
 "{count} folders" => "{count} টি ফোল্ডার",
 "1 file" => "১টি ফাইল",
 "{count} files" => "{count} টি ফাইল",
+"Unable to rename file" => "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না",
 "Upload" => "আপলোড",
 "File handling" => "ফাইল হ্যার্ডলিং",
 "Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
@@ -47,7 +48,7 @@
 "Enable ZIP-download" => "ZIP ডাউনলোড সক্রিয় কর",
 "0 is unlimited" => "০ এর অর্থ অসীম",
 "Maximum input size for ZIP files" => "ZIP ফাইলের ইনপুটের সর্বোচ্চ আকার",
-"Save" => "সংরক্ষন কর",
+"Save" => "সংরক্ষণ",
 "New" => "নতুন",
 "Text file" => "টেক্সট ফাইল",
 "Folder" => "ফোল্ডার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index d92dbeef67cec056c069065f86cd06c5e610c653..c1c94b99003f6d52dbf5bbb3736af9ed7bbf5c26 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
 "Could not move %s" => " No s'ha pogut moure %s",
-"Unable to rename file" => "No es pot canviar el nom del fitxer",
 "No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
-"There is no error, the file uploaded with success" => "El fitxer s'ha pujat correctament",
+"There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML",
-"The uploaded file was only partially uploaded" => "El fitxer només s'ha pujat parcialment",
-"No file was uploaded" => "El fitxer no s'ha pujat",
-"Missing a temporary folder" => "S'ha perdut un fitxer temporal",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
+"The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
+"No file was uploaded" => "No s'ha carregat cap fitxer",
+"Missing a temporary folder" => "Falta un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Not enough storage available" => "No hi ha prou espai disponible",
 "Invalid directory." => "Directori no vàlid.",
 "Files" => "Fitxers",
+"Share" => "Comparteix",
 "Delete permanently" => "Esborra permanentment",
-"Delete" => "Suprimeix",
+"Delete" => "Esborra",
 "Rename" => "Reanomena",
-"Pending" => "Pendents",
+"Pending" => "Pendent",
 "{new_name} already exists" => "{new_name} ja existeix",
 "replace" => "substitueix",
 "suggest name" => "sugereix un nom",
@@ -46,6 +46,8 @@
 "{count} folders" => "{count} carpetes",
 "1 file" => "1 fitxer",
 "{count} files" => "{count} fitxers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud",
+"Unable to rename file" => "No es pot canviar el nom del fitxer",
 "Upload" => "Puja",
 "File handling" => "Gestió de fitxers",
 "Maximum upload size" => "Mida màxima de pujada",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 66c748fbaa07480c88003eb400fd9fffe4a7550e..de6a15424212d891a01bf270a991c85ceedb9461 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem",
 "Could not move %s" => "Nelze přesunout %s",
-"Unable to rename file" => "Nelze přejmenovat soubor",
 "No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
 "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
@@ -13,10 +12,11 @@
 "Not enough storage available" => "Nedostatek dostupného úložného prostoru",
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
+"Share" => "Sdílet",
 "Delete permanently" => "Trvale odstranit",
 "Delete" => "Smazat",
 "Rename" => "Přejmenovat",
-"Pending" => "Čekající",
+"Pending" => "Nevyřízené",
 "{new_name} already exists" => "{new_name} již existuje",
 "replace" => "nahradit",
 "suggest name" => "navrhnout název",
@@ -32,7 +32,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů",
 "Not enough space available" => "Nedostatek dostupného místa",
 "Upload cancelled." => "Odesílání zrušeno.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
@@ -41,11 +41,12 @@
 "Error" => "Chyba",
 "Name" => "Název",
 "Size" => "Velikost",
-"Modified" => "Změněno",
+"Modified" => "Upraveno",
 "1 folder" => "1 složka",
 "{count} folders" => "{count} složky",
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
+"Unable to rename file" => "Nelze přejmenovat soubor",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
 "Maximum upload size" => "Maximální velikost pro odesílání",
@@ -65,7 +66,7 @@
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
 "Download" => "Stáhnout",
 "Unshare" => "Zrušit sdílení",
-"Upload too large" => "Odeslaný soubor je příliš velký",
+"Upload too large" => "Odesílaný soubor je příliš velký",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
 "Current scanning" => "Aktuální prohledávání",
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae3394889109c7c433750946b7d7c856e793ec89
--- /dev/null
+++ b/apps/files/l10n/cy_GB.php
@@ -0,0 +1,74 @@
+<?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
+"Could not move %s" => "Methwyd symud %s",
+"No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
+"There is no error, the file uploaded with success" => "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML",
+"The uploaded file was only partially uploaded" => "Dim ond yn rhannol y llwythwyd y ffeil i fyny",
+"No file was uploaded" => "Ni lwythwyd ffeil i fyny",
+"Missing a temporary folder" => "Plygell dros dro yn eisiau",
+"Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg",
+"Not enough storage available" => "Dim digon o le storio ar gael",
+"Invalid directory." => "Cyfeiriadur annilys.",
+"Files" => "Ffeiliau",
+"Share" => "Rhannu",
+"Delete permanently" => "Dileu'n barhaol",
+"Delete" => "Dileu",
+"Rename" => "Ailenwi",
+"Pending" => "I ddod",
+"{new_name} already exists" => "{new_name} yn bodoli'n barod",
+"replace" => "amnewid",
+"suggest name" => "awgrymu enw",
+"cancel" => "diddymu",
+"replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
+"undo" => "dadwneud",
+"perform delete operation" => "cyflawni gweithred dileu",
+"1 file uploading" => "1 ffeil yn llwytho i fyny",
+"files uploading" => "ffeiliau'n llwytho i fyny",
+"'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
+"File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
+"Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit",
+"Not enough space available" => "Dim digon o le ar gael",
+"Upload cancelled." => "Diddymwyd llwytho i fyny.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
+"URL cannot be empty." => "Does dim hawl cael URL gwag.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud",
+"Error" => "Gwall",
+"Name" => "Enw",
+"Size" => "Maint",
+"Modified" => "Addaswyd",
+"1 folder" => "1 blygell",
+"{count} folders" => "{count} plygell",
+"1 file" => "1 ffeil",
+"{count} files" => "{count} ffeil",
+"Unable to rename file" => "Methu ailenwi ffeil",
+"Upload" => "Llwytho i fyny",
+"File handling" => "Trafod ffeiliau",
+"Maximum upload size" => "Maint mwyaf llwytho i fyny",
+"max. possible: " => "mwyaf. posib:",
+"Needed for multi-file and folder downloads." => "Angen ar gyfer llwytho mwy nag un ffeil neu blygell i lawr yr un pryd.",
+"Enable ZIP-download" => "Galluogi llwytho i lawr ZIP",
+"0 is unlimited" => "0 yn ddiderfyn",
+"Maximum input size for ZIP files" => "Maint mewnbynnu mwyaf ffeiliau ZIP",
+"Save" => "Cadw",
+"New" => "Newydd",
+"Text file" => "Ffeil destun",
+"Folder" => "Plygell",
+"From link" => "Dolen o",
+"Deleted files" => "Ffeiliau ddilewyd",
+"Cancel upload" => "Diddymu llwytho i fyny",
+"You don’t have write permissions here." => "Nid oes gennych hawliau ysgrifennu fan hyn.",
+"Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
+"Download" => "Llwytho i lawr",
+"Unshare" => "Dad-rannu",
+"Upload too large" => "Maint llwytho i fyny'n rhy fawr",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
+"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio.",
+"Current scanning" => "Sganio cyfredol",
+"Upgrading filesystem cache..." => "Uwchraddio storfa system ffeiliau..."
+);
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 7c065952aeaeab8b707e711777a7744e6eba7cf0..879fbc8451fcbb0ba17e2acae0609c4adb22f00d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
 "Could not move %s" => "Kunne ikke flytte %s",
-"Unable to rename file" => "Kunne ikke omdøbe fil",
 "No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
-"There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
+"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen",
-"The uploaded file was only partially uploaded" => "Den uploadede file blev kun delvist uploadet",
-"No file was uploaded" => "Ingen fil blev uploadet",
-"Missing a temporary folder" => "Mangler en midlertidig mappe",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
+"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
+"No file was uploaded" => "Ingen fil uploadet",
+"Missing a temporary folder" => "Manglende midlertidig mappe.",
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Not enough storage available" => "Der er ikke nok plads til rådlighed",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
+"Share" => "Del",
 "Delete permanently" => "Slet permanent",
 "Delete" => "Slet",
 "Rename" => "Omdøb",
@@ -25,13 +25,15 @@
 "undo" => "fortryd",
 "perform delete operation" => "udfør slet operation",
 "1 file uploading" => "1 fil uploades",
+"files uploading" => "uploader filer",
 "'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
 "File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
 "Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes.",
+"Not enough space available" => "ikke nok tilgængelig ledig plads ",
 "Upload cancelled." => "Upload afbrudt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
 "URL cannot be empty." => "URLen kan ikke være tom.",
@@ -44,6 +46,7 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Unable to rename file" => "Kunne ikke omdøbe fil",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimal upload-størrelse",
@@ -63,7 +66,7 @@
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Download" => "Download",
 "Unshare" => "Fjern deling",
-"Upload too large" => "Upload for stor",
+"Upload too large" => "Upload er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
 "Current scanning" => "Indlæser",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 34f02334866b3bf0f1a2f913a3860d1f85c57e34..bcc3a4c6c9da269ffdc8e8bf943bf4eaaa0f3b7a 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,38 +1,38 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits.",
-"Could not move %s" => "%s konnte nicht verschoben werden",
-"Unable to rename file" => "Die Datei konnte nicht umbenannt werden",
+"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+"Could not move %s" => "Konnte %s nicht verschieben",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"There is no error, the file uploaded with success" => "Datei fehlerfrei hochgeladen.",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
-"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
-"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
-"Missing a temporary folder" => "Temporärer Ordner fehlt.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist",
+"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
+"No file was uploaded" => "Keine Datei konnte übertragen werden.",
+"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough storage available" => "Nicht genug Speicherplatz verfügbar",
+"Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
-"Delete permanently" => "Permanent löschen",
+"Share" => "Teilen",
+"Delete permanently" => "Endgültig löschen",
 "Delete" => "Löschen",
 "Rename" => "Umbenennen",
 "Pending" => "Ausstehend",
 "{new_name} already exists" => "{new_name} existiert bereits",
 "replace" => "ersetzen",
-"suggest name" => "Name vorschlagen",
+"suggest name" => "Namen vorschlagen",
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
 "perform delete operation" => "Löschvorgang ausführen",
-"1 file uploading" => "Eine Datei wird hoch geladen",
+"1 file uploading" => "1 Datei wird hochgeladen",
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)",
+"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
 "Not enough space available" => "Nicht genug Speicherplatz verfügbar",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
@@ -41,11 +41,12 @@
 "Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
-"Modified" => "Bearbeitet",
+"Modified" => "Geändert",
 "1 folder" => "1 Ordner",
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Unable to rename file" => "Konnte Datei nicht umbenennen",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -61,11 +62,11 @@
 "From link" => "Von einem Link",
 "Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
-"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.",
+"You don’t have write permissions here." => "Du hast hier keine Schreib-Berechtigung.",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Download" => "Herunterladen",
-"Unshare" => "Nicht mehr freigeben",
-"Upload too large" => "Upload zu groß",
+"Unshare" => "Freigabe aufheben",
+"Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 8fc1c106d0175cb8f7d26c8172cc9d587f6de901..3c06c1ac83de1c42c3b3bf7be0dff05761723656 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,51 +1,53 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
 "Could not move %s" => "Konnte %s nicht verschieben",
-"Unable to rename file" => "Konnte Datei nicht umbenennen",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
-"There is no error, the file uploaded with success" => "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in der php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
-"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
-"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
-"Missing a temporary folder" => "Der temporäre Ordner fehlt.",
+"There is no error, the file uploaded with success" => "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
+"The uploaded file was only partially uploaded" => "Die Datei konnte nur teilweise übertragen werden",
+"No file was uploaded" => "Keine Datei konnte übertragen werden.",
+"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
-"Delete permanently" => "Entgültig löschen",
+"Share" => "Teilen",
+"Delete permanently" => "Endgültig löschen",
 "Delete" => "Löschen",
 "Rename" => "Umbenennen",
 "Pending" => "Ausstehend",
 "{new_name} already exists" => "{new_name} existiert bereits",
 "replace" => "ersetzen",
-"suggest name" => "Einen Namen vorschlagen",
+"suggest name" => "Namen vorschlagen",
 "cancel" => "abbrechen",
 "replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
 "undo" => "rückgängig machen",
-"perform delete operation" => "führe das Löschen aus",
+"perform delete operation" => "Löschvorgang ausführen",
 "1 file uploading" => "1 Datei wird hochgeladen",
 "files uploading" => "Dateien werden hoch geladen",
 "'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name! Die Zeichen '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist.",
 "Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
 "Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "URL cannot be empty." => "Die URL darf nicht leer sein.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten",
 "Error" => "Fehler",
 "Name" => "Name",
 "Size" => "Größe",
-"Modified" => "Bearbeitet",
+"Modified" => "Geändert",
 "1 folder" => "1 Ordner",
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten.",
+"Unable to rename file" => "Konnte Datei nicht umbenennen",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-Größe",
@@ -62,12 +64,12 @@
 "Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
 "You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
-"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
+"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
 "Download" => "Herunterladen",
 "Unshare" => "Freigabe aufheben",
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
 "Current scanning" => "Scanne",
-"Upgrading filesystem cache..." => "Aktualisiere den Dateisystem-Cache..."
+"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
 );
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 60d63c41429113e220f2e456ff33dc2c2acd686a..b273f6b522dde74280b8fdf35be2ba7bb094b7da 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -1,11 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
 "Could not move %s" => "Αδυναμία μετακίνησης του %s",
-"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
 "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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
 "The uploaded file was only partially uploaded" => "Το αρχείο εστάλει μόνο εν μέρει",
 "No file was uploaded" => "Κανένα αρχείο δεν στάλθηκε",
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος",
 "Invalid directory." => "Μη έγκυρος φάκελος.",
 "Files" => "Αρχεία",
+"Share" => "Διαμοιρασμός",
 "Delete permanently" => "Μόνιμη διαγραφή",
 "Delete" => "Διαγραφή",
 "Rename" => "Μετονομασία",
@@ -46,7 +46,9 @@
 "{count} folders" => "{count} φάκελοι",
 "1 file" => "1 αρχείο",
 "{count} files" => "{count} αρχεία",
-"Upload" => "Αποστολή",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud",
+"Unable to rename file" => "Αδυναμία μετονομασίας αρχείου",
+"Upload" => "Μεταφόρτωση",
 "File handling" => "Διαχείριση αρχείων",
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
 "max. possible: " => "μέγιστο δυνατό:",
@@ -64,7 +66,7 @@
 "You don’t have write permissions here." => "Δεν έχετε δικαιώματα εγγραφής εδώ.",
 "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
 "Download" => "Λήψη",
-"Unshare" => "Διακοπή κοινής χρήσης",
+"Unshare" => "Σταμάτημα διαμοιρασμού",
 "Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..fdd1850da900c44cc2536ae2082becbf96f51e66
--- /dev/null
+++ b/apps/files/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Download" => "Download"
+);
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 3435f430597429fc4bff0d84ad7e73d6621e55b9..3eeb88754c75fdde2d0082fa205e8d2038210059 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,17 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
 "Could not move %s" => "Ne eblis movi %s",
-"Unable to rename file" => "Ne eblis alinomigi dosieron",
 "No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
-"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese",
+"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
-"The uploaded file was only partially uploaded" => "La alŝutita dosiero nur parte alŝutiĝis",
-"No file was uploaded" => "Neniu dosiero estas alŝutita",
-"Missing a temporary folder" => "Mankas tempa dosierujo",
+"The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
+"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",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
+"Share" => "Kunhavigi",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
 "Pending" => "Traktotaj",
@@ -22,6 +22,7 @@
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
 "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.",
@@ -40,6 +41,7 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
+"Unable to rename file" => "Ne eblis alinomigi dosieron",
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alŝutogrando",
@@ -57,7 +59,7 @@
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
 "Download" => "Elŝuti",
 "Unshare" => "Malkunhavigi",
-"Upload too large" => "Elŝuto tro larĝa",
+"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"
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index e231abe42902d88b475aa79251003afe274ee0ef..b11adfabeb3e0b67204d02f38ac274bd54f2adf0 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se puede mover %s - Ya existe un archivo con ese nombre",
 "Could not move %s" => "No se puede mover %s",
-"Unable to rename file" => "No se puede renombrar el archivo",
-"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
-"There is no error, the file uploaded with success" => "No se ha producido ningún error, el archivo se ha subido con éxito",
+"No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
+"There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentas subir sobrepasa el tamaño definido por la variable upload_max_filesize en php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo que intentas subir solo se subió parcialmente",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
 "No file was uploaded" => "No se ha subido ningún archivo",
-"Missing a temporary folder" => "Falta un directorio temporal",
+"Missing a temporary folder" => "Falta la carpeta temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Not enough storage available" => "No hay suficiente espacio disponible",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
+"Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Eliminar",
 "Rename" => "Renombrar",
-"Pending" => "Pendiente",
+"Pending" => "Pendientes",
 "{new_name} already exists" => "{new_name} ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
@@ -26,18 +26,18 @@
 "perform delete operation" => "Eliminar",
 "1 file uploading" => "subiendo 1 archivo",
 "files uploading" => "subiendo archivos",
-"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
+"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
+"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Imposible subir su archivo, es un directorio o tiene 0 bytes",
 "Not enough space available" => "No hay suficiente espacio disponible",
 "Upload cancelled." => "Subida cancelada.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida.",
 "URL cannot be empty." => "La URL no puede estar vacía.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud",
 "Error" => "Error",
 "Name" => "Nombre",
 "Size" => "Tamaño",
@@ -46,6 +46,8 @@
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud",
+"Unable to rename file" => "No se puede renombrar el archivo",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
@@ -65,9 +67,9 @@
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Download" => "Descargar",
 "Unshare" => "Dejar de compartir",
-"Upload too large" => "El archivo es demasiado grande",
+"Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
-"Current scanning" => "Ahora escaneando",
-"Upgrading filesystem cache..." => "Actualizando cache de archivos de sistema"
+"Current scanning" => "Escaneo actual",
+"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos"
 );
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index bd33fdfa4a5bb06bb40b8fa495240f3b04acea27..0ae47302edf7f020ab8e603e88178b5ff7bf602d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
 "Could not move %s" => "No se pudo mover %s ",
-"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
 "No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
-"There is no error, the file uploaded with success" => "No se han producido errores, el archivo se ha subido con éxito",
+"There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo que intentás subir solo se subió parcialmente",
-"No file was uploaded" => "El archivo no fue subido",
-"Missing a temporary folder" => "Falta un directorio temporal",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
+"The uploaded file was only partially uploaded" => "El archivo fue subido parcialmente",
+"No file was uploaded" => "No se subió ningún archivo ",
+"Missing a temporary folder" => "Error en la carpera temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
 "Not enough storage available" => "No hay suficiente capacidad de almacenamiento",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
+"Share" => "Compartir",
 "Delete permanently" => "Borrar de manera permanente",
 "Delete" => "Borrar",
 "Rename" => "Cambiar nombre",
-"Pending" => "Pendiente",
+"Pending" => "Pendientes",
 "{new_name} already exists" => "{new_name} ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
@@ -25,6 +25,7 @@
 "undo" => "deshacer",
 "perform delete operation" => "Eliminar",
 "1 file uploading" => "Subiendo 1 archivo",
+"files uploading" => "Subiendo archivos",
 "'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
 "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
@@ -45,6 +46,8 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nombre de carpeta inválido. El uso de \"Shared\" está reservado por ownCloud",
+"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
@@ -64,7 +67,7 @@
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
 "Download" => "Descargar",
 "Unshare" => "Dejar de compartir",
-"Upload too large" => "El archivo es demasiado grande",
+"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
 "Current scanning" => "Escaneo actual",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 64a2f71b2715e74bddebbcf6bc1f6ef563409823..d3fab4b0bd167e59a03f3f9e0f1f620a155b850c 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -1,11 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
 "Could not move %s" => "%s liigutamine ebaõnnestus",
-"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
 "No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
-"There is no error, the file uploaded with success" => "Ühtegi viga pole, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse",
+"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
 "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
@@ -13,9 +12,10 @@
 "Not enough storage available" => "Saadaval pole piisavalt ruumi",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
+"Share" => "Jaga",
 "Delete permanently" => "Kustuta jäädavalt",
 "Delete" => "Kustuta",
-"Rename" => "ümber",
+"Rename" => "Nimeta ümber",
 "Pending" => "Ootel",
 "{new_name} already exists" => "{new_name} on juba olemas",
 "replace" => "asenda",
@@ -24,18 +24,18 @@
 "replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
 "undo" => "tagasi",
 "perform delete operation" => "teosta kustutamine",
-"1 file uploading" => "1 faili üleslaadimisel",
-"files uploading" => "failide üleslaadimine",
+"1 file uploading" => "1 fail üleslaadimisel",
+"files uploading" => "faili üleslaadimisel",
 "'.' is an invalid file name." => "'.' on vigane failinimi.",
 "File name cannot be empty." => "Faili nimi ei saa olla tühi.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!",
+"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
+"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti",
 "Not enough space available" => "Pole piisavalt ruumi",
 "Upload cancelled." => "Üleslaadimine tühistati.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
 "URL cannot be empty." => "URL ei saa olla tühi.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
 "Error" => "Viga",
@@ -46,6 +46,8 @@
 "{count} folders" => "{count} kausta",
 "1 file" => "1 fail",
 "{count} files" => "{count} faili",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt.",
+"Unable to rename file" => "Faili ümbernimetamine ebaõnnestus",
 "Upload" => "Lae üles",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
@@ -61,13 +63,13 @@
 "From link" => "Allikast",
 "Deleted files" => "Kustutatud failid",
 "Cancel upload" => "Tühista üleslaadimine",
-"You don’t have write permissions here." => "Siin puudvad Sul kirjutamisõigused.",
+"You don’t have write permissions here." => "Siin puudvad sul kirjutamisõigused.",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
 "Download" => "Lae alla",
 "Unshare" => "Lõpeta jagamine",
 "Upload too large" => "Ãœleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
-"Files are being scanned, please wait." => "Faile skannitakse, palun oota",
+"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
 "Current scanning" => "Praegune skannimine",
-"Upgrading filesystem cache..." => "Uuendan failisüsteemi puhvrit..."
+"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
 );
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 8c244babf0808ab2984547661259419665b754be..a4afc2e8ca801c335c9f7970a0ea0b9ffdf22db3 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
-"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
 "No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
-"There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
+"There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
-"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
+"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
 "No file was uploaded" => "Ez da fitxategirik igo",
-"Missing a temporary folder" => "Aldi baterako karpeta falta da",
+"Missing a temporary folder" => "Aldi bateko karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
 "Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
+"Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
 "Delete" => "Ezabatu",
 "Rename" => "Berrizendatu",
@@ -25,13 +25,14 @@
 "undo" => "desegin",
 "perform delete operation" => "Ezabatu",
 "1 file uploading" => "fitxategi 1 igotzen",
+"files uploading" => "fitxategiak igotzen",
 "'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
 "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
 "Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
 "Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako",
 "Not enough space available" => "Ez dago leku nahikorik.",
 "Upload cancelled." => "Igoera ezeztatuta",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -45,6 +46,7 @@
 "{count} folders" => "{count} karpeta",
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
+"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
 "Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
@@ -64,7 +66,7 @@
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
 "Download" => "Deskargatu",
 "Unshare" => "Ez elkarbanatu",
-"Upload too large" => "Igotakoa handiegia da",
+"Upload too large" => "Igoera handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
 "Current scanning" => "Orain eskaneatzen ari da",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 13ef465199dbb8ac2d4fbd85261825148de69084..b97067ac19314eb9fc3d694ff8f638faffc48b22 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
 "Could not move %s" => "%s نمی تواند حرکت کند ",
-"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
 "No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
-"There is no error, the file uploaded with success" => "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد",
+"There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE",
-"The uploaded file was only partially uploaded" => "مقدار کمی از فایل بارگذاری شده",
-"No file was uploaded" => "هیچ فایلی بارگذاری نشده",
-"Missing a temporary folder" => "یک پوشه موقت گم شده است",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
+"The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
+"No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
+"Missing a temporary folder" => "یک پوشه موقت گم شده",
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Not enough storage available" => "فضای کافی در دسترس نیست",
 "Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
-"Files" => "فایل ها",
+"Files" => "پرونده‌ها",
+"Share" => "اشتراک‌گذاری",
 "Delete permanently" => "حذف قطعی",
-"Delete" => "پاک کردن",
+"Delete" => "حذف",
 "Rename" => "تغییرنام",
 "Pending" => "در انتظار",
 "{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.",
@@ -41,12 +41,13 @@
 "Error" => "خطا",
 "Name" => "نام",
 "Size" => "اندازه",
-"Modified" => "تغییر یافته",
+"Modified" => "تاریخ",
 "1 folder" => "1 پوشه",
 "{count} folders" => "{ شمار} پوشه ها",
 "1 file" => "1 پرونده",
 "{count} files" => "{ شمار } فایل ها",
-"Upload" => "بارگذاری",
+"Unable to rename file" => "قادر به تغییر نام پرونده نیست.",
+"Upload" => "بارگزاری",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
 "max. possible: " => "حداکثرمقدارممکن:",
@@ -63,9 +64,9 @@
 "Cancel upload" => "متوقف کردن بار گذاری",
 "You don’t have write permissions here." => "شما اجازه ی نوشتن در اینجا را ندارید",
 "Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
-"Download" => "بارگیری",
+"Download" => "دانلود",
 "Unshare" => "لغو اشتراک",
-"Upload too large" => "حجم بارگذاری بسیار زیاد است",
+"Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
 "Current scanning" => "بازرسی کنونی",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index b797273d51449ebce4593a7ceefe16f51e1f161f..3d0d724578144d9776db2c9d8d7752a27138aa54 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -1,17 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
 "Could not move %s" => "Kohteen %s siirto ei onnistunut",
-"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa",
 "The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
 "No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
-"Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
+"Missing a temporary folder" => "Tilapäiskansio puuttuu",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
+"Share" => "Jaa",
 "Delete permanently" => "Poista pysyvästi",
 "Delete" => "Poista",
 "Rename" => "Nimeä uudelleen",
@@ -28,7 +29,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio.",
 "Not enough space available" => "Tilaa ei ole riittävästi",
 "Upload cancelled." => "Lähetys peruttu.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
@@ -36,11 +37,12 @@
 "Error" => "Virhe",
 "Name" => "Nimi",
 "Size" => "Koko",
-"Modified" => "Muutettu",
+"Modified" => "Muokattu",
 "1 folder" => "1 kansio",
 "{count} folders" => "{count} kansiota",
 "1 file" => "1 tiedosto",
 "{count} files" => "{count} tiedostoa",
+"Unable to rename file" => "Tiedoston nimeäminen uudelleen ei onnistunut",
 "Upload" => "Lähetä",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 4a602c21ec50c3ac2c0e137637ba1a3ca87f8589..39c697396c919c69a6349ae94f44b2f47c8f2882 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
 "Could not move %s" => "Impossible de déplacer %s",
-"Unable to rename file" => "Impossible de renommer le fichier",
-"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
-"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été téléversé avec succès",
+"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
+"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse la valeur upload_max_filesize située dans le fichier php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML",
-"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement téléversé",
-"No file was uploaded" => "Aucun fichier n'a été téléversé",
-"Missing a temporary folder" => "Il manque un répertoire temporaire",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
+"No file was uploaded" => "Pas de fichier envoyé.",
+"Missing a temporary folder" => "Absence de dossier temporaire.",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Not enough storage available" => "Plus assez d'espace de stockage disponible",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
+"Share" => "Partager",
 "Delete permanently" => "Supprimer de façon définitive",
 "Delete" => "Supprimer",
 "Rename" => "Renommer",
-"Pending" => "En cours",
+"Pending" => "En attente",
 "{new_name} already exists" => "{new_name} existe déjà",
 "replace" => "remplacer",
 "suggest name" => "Suggérer un nom",
@@ -24,16 +24,17 @@
 "replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
 "undo" => "annuler",
 "perform delete operation" => "effectuer l'opération de suppression",
-"1 file uploading" => "1 fichier en cours de téléchargement",
+"1 file uploading" => "1 fichier en cours d'envoi",
+"files uploading" => "fichiers en cours d'envoi",
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
 "File name cannot be empty." => "Le nom de fichier ne peut être vide.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle",
 "Not enough space available" => "Espace disponible insuffisant",
-"Upload cancelled." => "Chargement annulé.",
+"Upload cancelled." => "Envoi annulé.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
 "URL cannot be empty." => "L'URL ne peut-être vide",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
@@ -45,6 +46,8 @@
 "{count} folders" => "{count} dossiers",
 "1 file" => "1 fichier",
 "{count} files" => "{count} fichiers",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud",
+"Unable to rename file" => "Impossible de renommer le fichier",
 "Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
@@ -64,7 +67,7 @@
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Download" => "Télécharger",
 "Unshare" => "Ne plus partager",
-"Upload too large" => "Fichier trop volumineux",
+"Upload too large" => "Téléversement trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
 "Current scanning" => "Analyse en cours",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 14992f5838537a56f7385c960b91d33c37913c8e..d22ed4b87215d156509866f3a81ac712d2c9b02f 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Non se moveu %s - Xa existe un ficheiro con ese nome.",
 "Could not move %s" => "Non foi posíbel mover %s",
-"Unable to rename file" => "Non é posíbel renomear o ficheiro",
-"No file was uploaded. Unknown error" => "Non foi enviado ningún ficheiro. Produciuse un erro descoñecido.",
-"There is no error, the file uploaded with success" => "Non se produciu ningún erro. O ficheiro enviouse correctamente",
+"No file was uploaded. Unknown error" => "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
+"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro enviouse correctamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente enviado",
 "No file was uploaded" => "Non se enviou ningún ficheiro",
-"Missing a temporary folder" => "Falta un cartafol temporal",
+"Missing a temporary folder" => "Falta o cartafol temporal",
 "Failed to write to disk" => "Produciuse un erro ao escribir no disco",
 "Not enough storage available" => "Non hai espazo de almacenamento abondo",
 "Invalid directory." => "O directorio é incorrecto.",
 "Files" => "Ficheiros",
+"Share" => "Compartir",
 "Delete permanently" => "Eliminar permanentemente",
 "Delete" => "Eliminar",
 "Rename" => "Renomear",
@@ -46,12 +46,14 @@
 "{count} folders" => "{count} cartafoles",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod",
+"Unable to rename file" => "Non é posíbel renomear o ficheiro",
 "Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo do envío",
 "max. possible: " => "máx. posíbel: ",
 "Needed for multi-file and folder downloads." => "Precísase para a descarga de varios ficheiros e cartafoles.",
-"Enable ZIP-download" => "Habilitar a descarga-ZIP",
+"Enable ZIP-download" => "Activar a descarga ZIP",
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
 "Save" => "Gardar",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 36ba7cc5de243e65f1df707a88a6a48e88d5aea1..963f25ebedcd661eb55f46ecd4c458b116fd0a91 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -1,13 +1,14 @@
 <?php $TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
-"There is no error, the file uploaded with success" => "לא אירעה תקלה, הקבצים הועלו בהצלחה",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML",
-"The uploaded file was only partially uploaded" => "הקובץ שהועלה הועלה בצורה חלקית",
-"No file was uploaded" => "לא הועלו קבצים",
-"Missing a temporary folder" => "תיקייה זמנית חסרה",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
+"No file was uploaded" => "שום קובץ לא הועלה",
+"Missing a temporary folder" => "תקיה זמנית חסרה",
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
+"Share" => "שתף",
 "Delete permanently" => "מחק לצמיתות",
 "Delete" => "מחיקה",
 "Rename" => "שינוי שם",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index a6b83b3d67c0d0be9c6482694802d03d388dcc1a..d634faee7537ca22813eb4b21ff54c969fb838b3 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Datoteka je poslana uspješno i bez pogrešaka",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu",
-"The uploaded file was only partially uploaded" => "Datoteka je poslana samo djelomično",
-"No file was uploaded" => "Ni jedna datoteka nije poslana",
-"Missing a temporary folder" => "Nedostaje privremena mapa",
+"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
+"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
+"No file was uploaded" => "Datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
-"Delete" => "Briši",
+"Share" => "Podijeli",
+"Delete" => "Obriši",
 "Rename" => "Promjeni ime",
 "Pending" => "U tijeku",
 "replace" => "zamjeni",
@@ -14,14 +15,15 @@
 "cancel" => "odustani",
 "undo" => "vrati",
 "1 file uploading" => "1 datoteka se učitava",
+"files uploading" => "datoteke se učitavaju",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
 "Upload cancelled." => "Slanje poništeno.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
 "Error" => "Greška",
-"Name" => "Naziv",
+"Name" => "Ime",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
-"Upload" => "Pošalji",
+"Upload" => "Učitaj",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veličina prijenosa",
 "max. possible: " => "maksimalna moguća: ",
@@ -35,8 +37,8 @@
 "Folder" => "mapa",
 "Cancel upload" => "Prekini upload",
 "Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
-"Download" => "Preuzmi",
-"Unshare" => "Prekini djeljenje",
+"Download" => "Preuzimanje",
+"Unshare" => "Makni djeljenje",
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
 "Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 103523b65f438de5cbc8c1523cae093591f0a745..76b8bd420da8d84bb4813da057b27f7da3c7bcd1 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
 "Could not move %s" => "Nem sikerült %s áthelyezése",
-"Unable to rename file" => "Nem lehet átnevezni a fájlt",
 "No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
 "There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra.",
 "The uploaded file was only partially uploaded" => "Az eredeti fájlt csak részben sikerült feltölteni.",
-"No file was uploaded" => "Nem töltődött fel semmi",
+"No file was uploaded" => "Nem töltődött fel állomány",
 "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
 "Failed to write to disk" => "Nem sikerült a lemezre történő írás",
 "Not enough storage available" => "Nincs elég szabad hely.",
 "Invalid directory." => "Érvénytelen mappa.",
 "Files" => "Fájlok",
+"Share" => "Megosztás",
 "Delete permanently" => "Végleges törlés",
 "Delete" => "Törlés",
 "Rename" => "Átnevezés",
@@ -46,6 +46,8 @@
 "{count} folders" => "{count} mappa",
 "1 file" => "1 fájl",
 "{count} files" => "{count} fájl",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés",
+"Unable to rename file" => "Nem lehet átnevezni a fájlt",
 "Upload" => "Feltöltés",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
@@ -64,7 +66,7 @@
 "You don’t have write permissions here." => "Itt nincs írásjoga.",
 "Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
 "Download" => "Letöltés",
-"Unshare" => "Megosztás visszavonása",
+"Unshare" => "A megosztás visszavonása",
 "Upload too large" => "A feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
 "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index b3233cc37d08da4fbb17678b4e18654064c41ce3..886922d954687866367c1e806a5f7d50a62430c2 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,9 +1,11 @@
 <?php $TRANSLATIONS = array(
 "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
-"No file was uploaded" => "Nulle file esseva incargate",
+"No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Files" => "Files",
+"Share" => "Compartir",
 "Delete" => "Deler",
+"Error" => "Error",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 3894ce0de9c25c05fd67745afdbc16b327e460d3..58cc0ea7fd953e2c086f45a3983d593012151b19 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,8 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
 "Could not move %s" => "Tidak dapat memindahkan %s",
-"Unable to rename file" => "Tidak dapat mengubah nama berkas",
-"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal",
+"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
 "There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "Ruang penyimpanan tidak mencukupi",
 "Invalid directory." => "Direktori tidak valid.",
 "Files" => "Berkas",
+"Share" => "Bagikan",
 "Delete permanently" => "Hapus secara permanen",
 "Delete" => "Hapus",
 "Rename" => "Ubah nama",
@@ -32,7 +32,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau ukurannya 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte",
 "Not enough space available" => "Ruang penyimpanan tidak mencukupi",
 "Upload cancelled." => "Pengunggahan dibatalkan.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} folder",
 "1 file" => "1 berkas",
 "{count} files" => "{count} berkas",
+"Unable to rename file" => "Tidak dapat mengubah nama berkas",
 "Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
@@ -65,7 +66,7 @@
 "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
 "Download" => "Unduh",
 "Unshare" => "Batalkan berbagi",
-"Upload too large" => "Unggahan terlalu besar",
+"Upload too large" => "Yang diunggah terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
 "Current scanning" => "Yang sedang dipindai",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index c7c8e9ccdb79472cd687dbba1e86545d573ade6f..aa10c838c1d71a945c8b8e9cc5358085fdc71213 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
 "Could not move %s" => "Gat ekki fært %s",
-"Unable to rename file" => "Gat ekki endurskýrt skrá",
 "No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
 "There is no error, the file uploaded with success" => "Engin villa, innsending heppnaðist",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:",
@@ -12,6 +11,7 @@
 "Failed to write to disk" => "Tókst ekki að skrifa á disk",
 "Invalid directory." => "Ógild mappa.",
 "Files" => "Skrár",
+"Share" => "Deila",
 "Delete" => "Eyða",
 "Rename" => "Endurskýra",
 "Pending" => "Bíður",
@@ -39,6 +39,7 @@
 "{count} folders" => "{count} möppur",
 "1 file" => "1 skrá",
 "{count} files" => "{count} skrár",
+"Unable to rename file" => "Gat ekki endurskýrt skrá",
 "Upload" => "Senda inn",
 "File handling" => "Meðhöndlun skrár",
 "Maximum upload size" => "Hámarks stærð innsendingar",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 20819e256406c52647bc4f4949714f80286339b4..c588285aacabab0d61dc185d882b4017fd224af2 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
 "Could not move %s" => "Impossibile spostare %s",
-"Unable to rename file" => "Impossibile rinominare il file",
 "No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
-"There is no error, the file uploaded with success" => "Non ci sono errori, file caricato con successo",
+"There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato caricato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML",
-"The uploaded file was only partially uploaded" => "Il file è stato parzialmente caricato",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
+"The uploaded file was only partially uploaded" => "Il file è stato caricato solo parzialmente",
 "No file was uploaded" => "Nessun file è stato caricato",
-"Missing a temporary folder" => "Cartella temporanea mancante",
+"Missing a temporary folder" => "Manca una cartella temporanea",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Not enough storage available" => "Spazio di archiviazione insufficiente",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
+"Share" => "Condividi",
 "Delete permanently" => "Elimina definitivamente",
 "Delete" => "Elimina",
 "Rename" => "Rinomina",
@@ -32,7 +32,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte",
 "Not enough space available" => "Spazio disponibile insufficiente",
 "Upload cancelled." => "Invio annullato",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
@@ -46,6 +46,8 @@
 "{count} folders" => "{count} cartelle",
 "1 file" => "1 file",
 "{count} files" => "{count} file",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud",
+"Unable to rename file" => "Impossibile rinominare il file",
 "Upload" => "Carica",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
@@ -65,7 +67,7 @@
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
 "Download" => "Scarica",
 "Unshare" => "Rimuovi condivisione",
-"Upload too large" => "Il file caricato è troppo grande",
+"Upload too large" => "Caricamento troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
 "Current scanning" => "Scansione corrente",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 28453618d9338e7ad8ee3e08e159af89a723d9b2..55dcf3640e7746d8d23a7cd00873474604fa32e9 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
 "Could not move %s" => "%s を移動できませんでした",
-"Unable to rename file" => "ファイル名の変更ができません",
 "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: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています",
-"The uploaded file was only partially uploaded" => "ファイルは一部分しかアップロードされませんでした",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
-"Missing a temporary folder" => "テンポラリフォルダが見つかりません",
+"Missing a temporary folder" => "一時保存フォルダが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Not enough storage available" => "ストレージに十分な空き容量がありません",
 "Invalid directory." => "無効なディレクトリです。",
 "Files" => "ファイル",
+"Share" => "共有",
 "Delete permanently" => "完全に削除する",
 "Delete" => "削除",
 "Rename" => "名前の変更",
-"Pending" => "保留",
+"Pending" => "中断",
 "{new_name} already exists" => "{new_name} はすでに存在しています",
 "replace" => "置き換え",
 "suggest name" => "推奨名称",
@@ -41,11 +41,13 @@
 "Error" => "エラー",
 "Name" => "名前",
 "Size" => "サイズ",
-"Modified" => "更新日時",
+"Modified" => "変更",
 "1 folder" => "1 フォルダ",
 "{count} folders" => "{count} フォルダ",
 "1 file" => "1 ファイル",
 "{count} files" => "{count} ファイル",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです",
+"Unable to rename file" => "ファイル名の変更ができません",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
@@ -55,7 +57,7 @@
 "0 is unlimited" => "0を指定した場合は無制限",
 "Maximum input size for ZIP files" => "ZIPファイルへの最大入力サイズ",
 "Save" => "保存",
-"New" => "新規",
+"New" => "新規作成",
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
 "From link" => "リンク",
@@ -64,8 +66,8 @@
 "You don’t have write permissions here." => "あなたには書き込み権限がありません。",
 "Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
 "Download" => "ダウンロード",
-"Unshare" => "共有しない",
-"Upload too large" => "ファイルサイズが大きすぎます",
+"Unshare" => "共有解除",
+"Upload too large" => "アップロードには大きすぎます。",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
 "Current scanning" => "スキャン中",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 6ea75a2ea92371bf0a37326cc9ec6610e5c1d4dd..c50ca2594b6db137143b18a48ba7cd8077544176 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
 "Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
-"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
 "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 ფაილში",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
 "Invalid directory." => "დაუშვებელი დირექტორია.",
 "Files" => "ფაილები",
+"Share" => "გაზიარება",
 "Delete permanently" => "სრულად წაშლა",
 "Delete" => "წაშლა",
 "Rename" => "გადარქმევა",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} საქაღალდე",
 "1 file" => "1 ფაილი",
 "{count} files" => "{count} ფაილი",
+"Unable to rename file" => "ფაილის სახელის გადარქმევა ვერ მოხერხდა",
 "Upload" => "ატვირთვა",
 "File handling" => "ფაილის დამუშავება",
 "Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
@@ -64,7 +65,7 @@
 "You don’t have write permissions here." => "თქვენ არ გაქვთ ჩაწერის უფლება აქ.",
 "Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
 "Download" => "ჩამოტვირთვა",
-"Unshare" => "გაზიარების მოხსნა",
+"Unshare" => "გაუზიარებადი",
 "Upload too large" => "ასატვირთი ფაილი ძალიან დიდია",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
 "Files are being scanned, please wait." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 88378bb486f866e5ebd0c6d497935ff693117537..c78f58542e460d27b5b9cab6acb249a4e2b15580 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -1,34 +1,38 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존재함",
 "Could not move %s" => "%s 항목을 이딩시키지 못하였음",
-"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
 "No file was uploaded. Unknown error" => "파일이 업로드되지 않았습니다. 알 수 없는 오류입니다",
-"There is no error, the file uploaded with success" => "업로드에 성공하였습니다.",
+"There is no error, the file uploaded with success" => "파일 업로드에 성공하였습니다.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼",
-"The uploaded file was only partially uploaded" => "파일이 부분적으로 업로드됨",
-"No file was uploaded" => "업로드된 파일 없음",
-"Missing a temporary folder" => "임시 폴더가 사라짐",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼",
+"The uploaded file was only partially uploaded" => "파일의 일부분만 업로드됨",
+"No file was uploaded" => "파일이 업로드되지 않았음",
+"Missing a temporary folder" => "임시 폴더가 없음",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
+"Not enough storage available" => "저장소가 용량이 충분하지 않습니다.",
 "Invalid directory." => "올바르지 않은 디렉터리입니다.",
 "Files" => "파일",
+"Share" => "공유",
+"Delete permanently" => "영원히 삭제",
 "Delete" => "삭제",
 "Rename" => "이름 바꾸기",
-"Pending" => "보류 중",
+"Pending" => "대기 중",
 "{new_name} already exists" => "{new_name}이(가) 이미 존재함",
 "replace" => "바꾸기",
 "suggest name" => "이름 제안",
 "cancel" => "취소",
 "replaced {new_name} with {old_name}" => "{old_name}이(가) {new_name}(으)로 대체됨",
-"undo" => "실행 취소",
+"undo" => "되돌리기",
+"perform delete operation" => "삭제 작업중",
 "1 file uploading" => "파일 1개 업로드 중",
+"files uploading" => "파일 업로드중",
 "'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름 입니다.",
 "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
 "Your storage is full, files can not be updated or synced anymore!" => "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
 "Your storage is almost full ({usedSpacePercent}%)" => "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다",
+"Unable to upload your file as it is a directory or has 0 bytes" => "디렉터리 및 빈 파일은 업로드할 수 없습니다",
 "Not enough space available" => "여유 공간이 부족합니다",
 "Upload cancelled." => "업로드가 취소되었습니다.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
@@ -42,6 +46,7 @@
 "{count} folders" => "폴더 {count}개",
 "1 file" => "파일 1개",
 "{count} files" => "파일 {count}개",
+"Unable to rename file" => "파일 이름바꾸기 할 수 없음",
 "Upload" => "업로드",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
@@ -55,11 +60,13 @@
 "Text file" => "텍스트 파일",
 "Folder" => "폴더",
 "From link" => "링크에서",
+"Deleted files" => "파일 삭제됨",
 "Cancel upload" => "업로드 취소",
+"You don’t have write permissions here." => "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다.",
 "Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
 "Download" => "다운로드",
 "Unshare" => "공유 해제",
-"Upload too large" => "업로드 용량 초과",
+"Upload too large" => "업로드한 파일이 너무 큼",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
 "Current scanning" => "현재 검색",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 6533a123083549f0184b1db5fe25417321c47bb6..4a60295c5cb3680a3759f857c16579c7b06ef721 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -2,10 +2,11 @@
 "There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
 "The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
-"No file was uploaded" => "Et ass keng Datei ropgelueden ginn",
+"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
 "Missing a temporary folder" => "Et feelt en temporären Dossier",
 "Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
+"Share" => "Deelen",
 "Delete" => "Läschen",
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
@@ -31,7 +32,7 @@
 "Folder" => "Dossier",
 "Cancel upload" => "Upload ofbriechen",
 "Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Download" => "Eroflueden",
+"Download" => "Download",
 "Unshare" => "Net méi deelen",
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 750500a3d543924f12b6dab12a982c1a1fdb9bba..3e2ea80c9491d42023a6bfd8f6dd17671ffa7a3d 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -1,11 +1,12 @@
 <?php $TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Klaidų nėra, failas įkeltas sėkmingai",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje",
+"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
+"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 nė vienas failas",
+"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ą",
 "Files" => "Failai",
+"Share" => "Dalintis",
 "Delete" => "IÅ¡trinti",
 "Rename" => "Pervadinti",
 "Pending" => "Laukiantis",
@@ -44,7 +45,7 @@
 "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ų leidžiamą šiame serveryje",
+"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"
 );
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 1292514547bad878f11f1d5781d294ca34c1a9b5..f62bdd2d49226306ebaaa5870d6f532fe6f688d5 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,9 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
 "Could not move %s" => "Nevarēja pārvietot %s",
-"Unable to rename file" => "Nevarēja pārsaukt datni",
 "No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
-"There is no error, the file uploaded with success" => "Augšupielāde pabeigta bez kļūdām",
+"There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā",
 "The uploaded file was only partially uploaded" => "Augšupielādētā datne ir tikai daļēji augšupielādēta",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "Nav pietiekami daudz vietas",
 "Invalid directory." => "Nederīga direktorija.",
 "Files" => "Datnes",
+"Share" => "Dalīties",
 "Delete permanently" => "Dzēst pavisam",
 "Delete" => "Dzēst",
 "Rename" => "Pārsaukt",
@@ -31,7 +31,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tās izmērs ir 0 baiti",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela",
 "Not enough space available" => "Nepietiek brīvas vietas",
 "Upload cancelled." => "Augšupielāde ir atcelta.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
@@ -45,6 +45,7 @@
 "{count} folders" => "{count} mapes",
 "1 file" => "1 datne",
 "{count} files" => "{count} datnes",
+"Unable to rename file" => "Nevarēja pārsaukt datni",
 "Upload" => "Augšupielādēt",
 "File handling" => "Datņu pārvaldība",
 "Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 78fed25cf9234dfae9994084db9e79708ab55249..992618f06bfc044c4181be525a9b54f34346140e 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -1,13 +1,14 @@
 <?php $TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
-"There is no error, the file uploaded with success" => "Нема грешка, датотеката беше подигната успешно",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата",
 "The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
-"No file was uploaded" => "Не беше подигната датотека",
-"Missing a temporary folder" => "Не постои привремена папка",
+"No file was uploaded" => "Не беше подигната датотека.",
+"Missing a temporary folder" => "Недостасува привремена папка",
 "Failed to write to disk" => "Неуспеав да запишам на диск",
 "Files" => "Датотеки",
+"Share" => "Сподели",
 "Delete" => "Избриши",
 "Rename" => "Преименувај",
 "Pending" => "Чека",
@@ -48,7 +49,7 @@
 "Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
 "Download" => "Преземи",
 "Unshare" => "Не споделувај",
-"Upload too large" => "Датотеката е премногу голема",
+"Upload too large" => "Фајлот кој се вчитува е преголем",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
 "Current scanning" => "Моментално скенирам"
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index a390288b365a55d4caa3e0855ee6858951c1fb6f..2ce4f1633284f2efb84b9d42cb080536a7a0c509 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
-"There is no error, the file uploaded with success" => "Tiada ralat, fail berjaya dimuat naik.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML ",
-"The uploaded file was only partially uploaded" => "Sebahagian daripada fail telah dimuat naik. ",
-"No file was uploaded" => "Tiada fail yang dimuat naik",
-"Missing a temporary folder" => "Folder sementara hilang",
+"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
+"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
+"No file was uploaded" => "Tiada fail dimuatnaik",
+"Missing a temporary folder" => "Direktori sementara hilang",
 "Failed to write to disk" => "Gagal untuk disimpan",
-"Files" => "fail",
+"Files" => "Fail-fail",
+"Share" => "Kongsi",
 "Delete" => "Padam",
 "Pending" => "Dalam proses",
 "replace" => "ganti",
@@ -14,7 +15,7 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
 "Upload cancelled." => "Muatnaik dibatalkan.",
 "Error" => "Ralat",
-"Name" => "Nama ",
+"Name" => "Nama",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
 "Upload" => "Muat naik",
@@ -32,7 +33,7 @@
 "Cancel upload" => "Batal muat naik",
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
 "Download" => "Muat turun",
-"Upload too large" => "Muat naik terlalu besar",
+"Upload too large" => "Muatnaik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
 "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
 "Current scanning" => "Imbasan semasa"
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 54042c91243c5efa3336c91b4832ed8977bc4de3..d5710a4927a07f438afa6531298606fdbd8a3593 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
+"Could not move %s" => "Kunne ikke flytte %s",
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
-"There is no error, the file uploaded with success" => "Det er ingen feil. Filen ble lastet opp.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet",
-"The uploaded file was only partially uploaded" => "Filopplastningen ble bare delvis gjennomført",
-"No file was uploaded" => "Ingen fil ble lastet opp",
-"Missing a temporary folder" => "Mangler en midlertidig mappe",
+"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
+"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
+"No file was uploaded" => "Ingen filer ble lastet opp",
+"Missing a temporary folder" => "Mangler midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
+"Not enough storage available" => "Ikke nok lagringsplass",
+"Invalid directory." => "Ugyldig katalog.",
 "Files" => "Filer",
+"Share" => "Del",
 "Delete permanently" => "Slett permanent",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
@@ -17,12 +23,21 @@
 "cancel" => "avbryt",
 "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
 "undo" => "angre",
+"perform delete operation" => "utfør sletting",
 "1 file uploading" => "1 fil lastes opp",
+"files uploading" => "filer lastes opp",
+"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
+"File name cannot be empty." => "Filnavn kan ikke være tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Not enough space available" => "Ikke nok lagringsplass",
 "Upload cancelled." => "Opplasting avbrutt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
 "URL cannot be empty." => "URL-en kan ikke være tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
 "Error" => "Feil",
 "Name" => "Navn",
 "Size" => "Størrelse",
@@ -31,6 +46,8 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud.",
+"Unable to rename file" => "Kan ikke gi nytt navn",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
 "Maximum upload size" => "Maksimum opplastingsstørrelse",
@@ -44,12 +61,15 @@
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
 "From link" => "Fra link",
+"Deleted files" => "Slettet filer",
 "Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikke skrivetilgang her.",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
 "Download" => "Last ned",
 "Unshare" => "Avslutt deling",
-"Upload too large" => "Opplasting for stor",
+"Upload too large" => "Filen er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner etter filer, vennligst vent.",
-"Current scanning" => "Pågående skanning"
+"Current scanning" => "Pågående skanning",
+"Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
 );
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 38b55d34d9583668de10395590aac77133ab4d84..bc4158df3b3928befe482bbd8d5692f677d7de0a 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
 "Could not move %s" => "Kon %s niet verplaatsen",
-"Unable to rename file" => "Kan bestand niet hernoemen",
 "No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
-"There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
+"There is no error, the file uploaded with success" => "De upload van het bestand is goedgegaan.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier",
-"The uploaded file was only partially uploaded" => "Het bestand is slechts gedeeltelijk geupload",
-"No file was uploaded" => "Geen bestand geüpload",
-"Missing a temporary folder" => "Een tijdelijke map mist",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
+"The uploaded file was only partially uploaded" => "Het bestand is gedeeltelijk geüpload",
+"No file was uploaded" => "Er is geen bestand geüpload",
+"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
+"Share" => "Delen",
 "Delete permanently" => "Verwijder definitief",
 "Delete" => "Verwijder",
 "Rename" => "Hernoem",
-"Pending" => "Wachten",
+"Pending" => "In behandeling",
 "{new_name} already exists" => "{new_name} bestaat al",
 "replace" => "vervang",
 "suggest name" => "Stel een naam voor",
@@ -32,7 +32,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is",
 "Not enough space available" => "Niet genoeg ruimte beschikbaar",
 "Upload cancelled." => "Uploaden geannuleerd.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
@@ -40,13 +40,15 @@
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
 "Error" => "Fout",
 "Name" => "Naam",
-"Size" => "Bestandsgrootte",
-"Modified" => "Laatst aangepast",
+"Size" => "Grootte",
+"Modified" => "Aangepast",
 "1 folder" => "1 map",
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
-"Upload" => "Upload",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
+"Unable to rename file" => "Kan bestand niet hernoemen",
+"Upload" => "Uploaden",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
@@ -54,7 +56,7 @@
 "Enable ZIP-download" => "Zet ZIP-download aan",
 "0 is unlimited" => "0 is ongelimiteerd",
 "Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
-"Save" => "Opslaan",
+"Save" => "Bewaren",
 "New" => "Nieuw",
 "Text file" => "Tekstbestand",
 "Folder" => "Map",
@@ -63,9 +65,9 @@
 "Cancel upload" => "Upload afbreken",
 "You don’t have write permissions here." => "U hebt hier geen schrijfpermissies.",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
-"Download" => "Download",
-"Unshare" => "Stop delen",
-"Upload too large" => "Bestanden te groot",
+"Download" => "Downloaden",
+"Unshare" => "Stop met delen",
+"Upload too large" => "Upload is te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
 "Current scanning" => "Er wordt gescand",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 8f32dc012e35a9214de0bd04d0bd16cb36394409..29593b6f2def50a7d86a473355100ec45ba099ad 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,23 +1,75 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+"Could not move %s" => "Klarte ikkje flytta %s",
+"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
 "There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
 "The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
 "No file was uploaded" => "Ingen filer vart lasta opp",
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
+"Failed to write to disk" => "Klarte ikkje skriva til disk",
+"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
+"Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
+"Share" => "Del",
+"Delete permanently" => "Slett for godt",
 "Delete" => "Slett",
+"Rename" => "Endra namn",
+"Pending" => "Under vegs",
+"{new_name} already exists" => "{new_name} finst allereie",
+"replace" => "byt ut",
+"suggest name" => "føreslå namn",
+"cancel" => "avbryt",
+"replaced {new_name} with {old_name}" => "bytte ut {new_name} med {old_name}",
+"undo" => "angre",
+"perform delete operation" => "utfør sletting",
+"1 file uploading" => "1 fil lastar opp",
+"files uploading" => "filer lastar opp",
+"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
+"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
+"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
+"Upload cancelled." => "Opplasting avbroten.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
 "Error" => "Feil",
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
+"1 folder" => "1 mappe",
+"{count} folders" => "{count} mapper",
+"1 file" => "1 fil",
+"{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
+"Unable to rename file" => "Klarte ikkje endra filnamnet",
 "Upload" => "Last opp",
+"File handling" => "Filhandtering",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
+"max. possible: " => "maks. moglege:",
+"Needed for multi-file and folder downloads." => "Nødvendig for fleirfils- og mappenedlastingar.",
+"Enable ZIP-download" => "Slå på ZIP-nedlasting",
+"0 is unlimited" => "0 er ubegrensa",
+"Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
 "Save" => "Lagre",
 "New" => "Ny",
 "Text file" => "Tekst fil",
 "Folder" => "Mappe",
+"From link" => "Frå lenkje",
+"Deleted files" => "Sletta filer",
+"Cancel upload" => "Avbryt opplasting",
+"You don’t have write permissions here." => "Du har ikkje skriverettar her.",
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Download" => "Last ned",
+"Unshare" => "Udel",
 "Upload too large" => "For stor opplasting",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
+"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
+"Current scanning" => "Køyrande skanning",
+"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
 );
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index b1ef6216585a7158391eda412cc7c600f7b30ac1..fa31ddf9f43ea9a21720305209f30fd588a063f9 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -6,6 +6,7 @@
 "Missing a temporary folder" => "Un dorsièr temporari manca",
 "Failed to write to disk" => "L'escriptura sul disc a fracassat",
 "Files" => "Fichièrs",
+"Share" => "Parteja",
 "Delete" => "Escafa",
 "Rename" => "Torna nomenar",
 "Pending" => "Al esperar",
@@ -14,6 +15,7 @@
 "cancel" => "anulla",
 "undo" => "defar",
 "1 file uploading" => "1 fichièr al amontcargar",
+"files uploading" => "fichièrs al amontcargar",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
 "Upload cancelled." => "Amontcargar anullat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
@@ -36,7 +38,7 @@
 "Cancel upload" => " Anulla l'amontcargar",
 "Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
 "Download" => "Avalcarga",
-"Unshare" => "Non parteja",
+"Unshare" => "Pas partejador",
 "Upload too large" => "Amontcargament tròp gròs",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
 "Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index e9a78e2f442e182594197cb413cc21ec2b9992d4..4bdac05578189551de8da55cd84b5631ed25256c 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
 "Could not move %s" => "Nie można było przenieść %s",
-"Unable to rename file" => "Nie można zmienić nazwy pliku",
 "No file was uploaded. Unknown error" => "Żaden plik nie został załadowany. Nieznany błąd",
-"There is no error, the file uploaded with success" => "Przesłano plik",
+"There is no error, the file uploaded with success" => "Nie było błędów, plik wysłano poprawnie.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML",
 "The uploaded file was only partially uploaded" => "Załadowany plik został wysłany tylko częściowo.",
-"No file was uploaded" => "Nie przesłano żadnego pliku",
-"Missing a temporary folder" => "Brak katalogu tymczasowego",
+"No file was uploaded" => "Nie wysłano żadnego pliku",
+"Missing a temporary folder" => "Brak folderu tymczasowego",
 "Failed to write to disk" => "BÅ‚Ä…d zapisu na dysk",
 "Not enough storage available" => "Za mało dostępnego miejsca",
 "Invalid directory." => "Zła ścieżka.",
 "Files" => "Pliki",
+"Share" => "Udostępnij",
 "Delete permanently" => "Trwale usuń",
 "Delete" => "Usuń",
 "Rename" => "Zmień nazwę",
@@ -46,7 +46,9 @@
 "{count} folders" => "Ilość folderów: {count}",
 "1 file" => "1 plik",
 "{count} files" => "Ilość plików: {count}",
-"Upload" => "Prześlij",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud",
+"Unable to rename file" => "Nie można zmienić nazwy pliku",
+"Upload" => "Wyślij",
 "File handling" => "ZarzÄ…dzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
 "max. possible: " => "maks. możliwy:",
@@ -57,15 +59,15 @@
 "Save" => "Zapisz",
 "New" => "Nowy",
 "Text file" => "Plik tekstowy",
-"Folder" => "Katalog",
+"Folder" => "Folder",
 "From link" => "Z odnośnika",
 "Deleted files" => "Pliki usunięte",
 "Cancel upload" => "Anuluj wysyłanie",
 "You don’t have write permissions here." => "Nie masz uprawnień do zapisu w tym miejscu.",
 "Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
 "Download" => "Pobierz",
-"Unshare" => "Nie udostępniaj",
-"Upload too large" => "Wysyłany plik ma za duży rozmiar",
+"Unshare" => "Zatrzymaj współdzielenie",
+"Upload too large" => "Ładowany plik jest za duży",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
 "Current scanning" => "Aktualnie skanowane",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index ad8f37c24f63069e3fee818eebb490569cbc2380..0f349b694812830acc2dec8a4a813cccfc419443 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
 "Could not move %s" => "Impossível mover %s",
-"Unable to rename file" => "Impossível renomear arquivo",
 "No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
+"There is no error, the file uploaded with success" => "Sem erros, o arquivo foi enviado com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O arquivo foi transferido parcialmente",
-"No file was uploaded" => "Nenhum arquivo foi transferido",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
+"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente enviado",
+"No file was uploaded" => "Nenhum arquivo enviado",
 "Missing a temporary folder" => "Pasta temporária não encontrada",
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Not enough storage available" => "Espaço de armazenamento insuficiente",
 "Invalid directory." => "Diretório inválido.",
 "Files" => "Arquivos",
+"Share" => "Compartilhar",
 "Delete permanently" => "Excluir permanentemente",
 "Delete" => "Excluir",
 "Rename" => "Renomear",
@@ -46,7 +46,9 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 arquivo",
 "{count} files" => "{count} arquivos",
-"Upload" => "Carregar",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud",
+"Unable to rename file" => "Impossível renomear arquivo",
+"Upload" => "Upload",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
@@ -54,7 +56,7 @@
 "Enable ZIP-download" => "Habilitar ZIP-download",
 "0 is unlimited" => "0 para ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
-"Save" => "Salvar",
+"Save" => "Guardar",
 "New" => "Novo",
 "Text file" => "Arquivo texto",
 "Folder" => "Pasta",
@@ -65,7 +67,7 @@
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
 "Download" => "Baixar",
 "Unshare" => "Descompartilhar",
-"Upload too large" => "Arquivo muito grande",
+"Upload too large" => "Upload muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
 "Current scanning" => "Scanning atual",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 2ad40990838f7d34dbb76c0c50ca06b2d779ad00..d90e29997020968bf8a4333c62072af2258bd3ba 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
 "Could not move %s" => "Não foi possível move o ficheiro %s",
-"Unable to rename file" => "Não foi possível renomear o ficheiro",
 "No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Sem erro, ficheiro enviado com sucesso",
+"There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro enviado só foi enviado parcialmente",
-"No file was uploaded" => "Não foi enviado nenhum ficheiro",
-"Missing a temporary folder" => "Falta uma pasta temporária",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
+"No file was uploaded" => "Nenhum ficheiro foi submetido",
+"Missing a temporary folder" => "Está a faltar a pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Not enough storage available" => "Não há espaço suficiente em disco",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
+"Share" => "Partilhar",
 "Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
 "Rename" => "Renomear",
 "Pending" => "Pendente",
 "{new_name} already exists" => "O nome {new_name} já existe",
@@ -25,6 +25,7 @@
 "undo" => "desfazer",
 "perform delete operation" => "Executar a tarefa de apagar",
 "1 file uploading" => "A enviar 1 ficheiro",
+"files uploading" => "A enviar os ficheiros",
 "'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
 "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
@@ -45,11 +46,13 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"Upload" => "Enviar",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
+"Unable to rename file" => "Não foi possível renomear o ficheiro",
+"Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho máximo de envio",
 "max. possible: " => "max. possivel: ",
-"Needed for multi-file and folder downloads." => "Necessário para descarregamento múltiplo de ficheiros e pastas",
+"Needed for multi-file and folder downloads." => "Necessário para multi download de ficheiros e pastas",
 "Enable ZIP-download" => "Permitir descarregar em ficheiro ZIP",
 "0 is unlimited" => "0 é ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
@@ -64,8 +67,8 @@
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
 "Unshare" => "Deixar de partilhar",
-"Upload too large" => "Envio muito grande",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor.",
+"Upload too large" => "Upload muito grande",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
 "Current scanning" => "Análise actual",
 "Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index e3cab80fbc2515819bee397746037c736c67c177..8fdf62aeb32b1aab7004642d0287eb0c0142c930 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,17 +1,19 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nu se poate de mutat %s - Fișier cu acest nume deja există",
 "Could not move %s" => "Nu s-a putut muta %s",
-"Unable to rename file" => "Nu s-a putut redenumi fișierul",
 "No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
-"There is no error, the file uploaded with success" => "Nicio eroare, fișierul a fost încărcat cu succes",
+"There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
 "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
-"No file was uploaded" => "Niciun fișier încărcat",
-"Missing a temporary folder" => "Lipsește un dosar temporar",
+"No file was uploaded" => "Nu a fost încărcat nici un fișier",
+"Missing a temporary folder" => "Lipsește un director temporar",
 "Failed to write to disk" => "Eroare la scriere pe disc",
+"Not enough storage available" => "Nu este suficient spațiu disponibil",
 "Invalid directory." => "Director invalid.",
 "Files" => "Fișiere",
+"Share" => "Partajează",
+"Delete permanently" => "Stergere permanenta",
 "Delete" => "Șterge",
 "Rename" => "Redenumire",
 "Pending" => "În așteptare",
@@ -21,10 +23,14 @@
 "cancel" => "anulare",
 "replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
 "undo" => "Anulează ultima acțiune",
+"perform delete operation" => "efectueaza operatiunea de stergere",
 "1 file uploading" => "un fișier se încarcă",
+"files uploading" => "fișiere se încarcă",
 "'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
 "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
+"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere.",
+"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
 "Not enough space available" => "Nu este suficient spațiu disponibil",
@@ -40,7 +46,8 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
-"Upload" => "Încarcă",
+"Unable to rename file" => "Nu s-a putut redenumi fișierul",
+"Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
 "max. possible: " => "max. posibil:",
@@ -48,17 +55,20 @@
 "Enable ZIP-download" => "Activează descărcare fișiere compresate",
 "0 is unlimited" => "0 e nelimitat",
 "Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
-"Save" => "Salvare",
+"Save" => "Salvează",
 "New" => "Nou",
 "Text file" => "Fișier text",
 "Folder" => "Dosar",
 "From link" => "de la adresa",
+"Deleted files" => "Sterge fisierele",
 "Cancel upload" => "Anulează încărcarea",
+"You don’t have write permissions here." => "Nu ai permisiunea de a sterge fisiere aici.",
 "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
 "Download" => "Descarcă",
-"Unshare" => "Anulează partajarea",
+"Unshare" => "Anulare partajare",
 "Upload too large" => "Fișierul încărcat este prea mare",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
 "Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteptă.",
-"Current scanning" => "ÃŽn curs de scanare"
+"Current scanning" => "ÃŽn curs de scanare",
+"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
 );
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 37f2e083c4cc306b2dba6e9a97247144ba836722..83412bf2be80060232d6f0eece793056fc640832 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Невозможно переместить %s - файл с таким именем уже существует",
 "Could not move %s" => "Невозможно переместить %s",
-"Unable to rename file" => "Невозможно переименовать файл",
 "No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"There is no error, the file uploaded with success" => "Файл успешно загружен",
+"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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме",
-"The uploaded file was only partially uploaded" => "Файл был загружен не полностью",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
+"The uploaded file was only partially uploaded" => "Файл загружен частично",
 "No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Невозможно найти временную папку",
+"Missing a temporary folder" => "Отсутствует временная папка",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Not enough storage available" => "Недостаточно доступного места в хранилище",
 "Invalid directory." => "Неправильный каталог.",
 "Files" => "Файлы",
+"Share" => "Открыть доступ",
 "Delete permanently" => "Удалено навсегда",
 "Delete" => "Удалить",
 "Rename" => "Переименовать",
@@ -25,27 +25,29 @@
 "undo" => "отмена",
 "perform delete operation" => "выполняется операция удаления",
 "1 file uploading" => "загружается 1 файл",
+"files uploading" => "файлы загружаются",
 "'.' is an invalid file name." => "'.' - неправильное имя файла.",
 "File name cannot be empty." => "Имя файла не может быть пустым.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Файл не был загружен: его размер 0 байт либо это не файл, а директория.",
 "Not enough space available" => "Недостаточно свободного места",
 "Upload cancelled." => "Загрузка отменена.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
 "URL cannot be empty." => "Ссылка не может быть пустой.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
 "Error" => "Ошибка",
-"Name" => "Название",
+"Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменён",
 "1 folder" => "1 папка",
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлов",
-"Upload" => "Загрузить",
+"Unable to rename file" => "Невозможно переименовать файл",
+"Upload" => "Загрузка",
 "File handling" => "Управление файлами",
 "Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "макс. возможно: ",
@@ -63,8 +65,8 @@
 "You don’t have write permissions here." => "У вас нет разрешений на запись здесь.",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
-"Unshare" => "Отменить публикацию",
-"Upload too large" => "Файл слишком большой",
+"Unshare" => "Закрыть общий доступ",
+"Upload too large" => "Файл слишком велик",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
 "Current scanning" => "Текущее сканирование",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index a7c6c83fde00329726970467fcef757b76951b93..e0bfab33215ff8036017e3b024630f40c148fe63 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -1,70 +1,16 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Неполучается перенести %s - Файл с таким именем уже существует",
-"Could not move %s" => "Неполучается перенести %s ",
-"Unable to rename file" => "Невозможно переименовать файл",
 "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:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
-"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
+"There is no error, the file uploaded with success" => "Ошибки нет, файл успешно загружен",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен лишь частично",
 "No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствует временная папка",
+"Missing a temporary folder" => "Отсутствие временной папки",
 "Failed to write to disk" => "Не удалось записать на диск",
 "Not enough storage available" => "Недостаточно места в хранилище",
-"Invalid directory." => "Неверный каталог.",
-"Files" => "Файлы",
-"Delete permanently" => "Удалить навсегда",
+"Share" => "Сделать общим",
 "Delete" => "Удалить",
-"Rename" => "Переименовать",
-"Pending" => "Ожидающий решения",
-"{new_name} already exists" => "{новое_имя} уже существует",
-"replace" => "отмена",
-"suggest name" => "подобрать название",
-"cancel" => "отменить",
-"replaced {new_name} with {old_name}" => "заменено {новое_имя} с {старое_имя}",
-"undo" => "отменить действие",
-"perform delete operation" => "выполняется процесс удаления",
-"1 file uploading" => "загрузка 1 файла",
-"'.' is an invalid file name." => "'.' является неверным именем файла.",
-"File name cannot be empty." => "Имя файла не может быть пустым.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти полно ({usedSpacePercent}%)",
-"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
-"Not enough space available" => "Не достаточно свободного места",
-"Upload cancelled." => "Загрузка отменена",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
-"URL cannot be empty." => "URL не должен быть пустым.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud",
 "Error" => "Ошибка",
 "Name" => "Имя",
-"Size" => "Размер",
-"Modified" => "Изменен",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Upload" => "Загрузить ",
-"File handling" => "Работа с файлами",
-"Maximum upload size" => "Максимальный размер загружаемого файла",
-"max. possible: " => "Максимально возможный",
-"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.",
-"Enable ZIP-download" => "Включение ZIP-загрузки",
-"0 is unlimited" => "0 без ограничений",
-"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ",
 "Save" => "Сохранить",
-"New" => "Новый",
-"Text file" => "Текстовый файл",
-"Folder" => "Папка",
-"From link" => "По ссылке",
-"Cancel upload" => "Отмена загрузки",
-"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Download" => "Загрузить",
-"Unshare" => "Скрыть",
-"Upload too large" => "Загрузка слишком велика",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",
-"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.",
-"Current scanning" => "Текущее сканирование",
-"Upgrading filesystem cache..." => "Обновление кэша файловой системы... "
+"Download" => "Загрузка"
 );
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index dfcca6f689baf80ae82c4f931f43f3c3974d0ed4..351021a9f8bf1ad3df0a7eac44c692418d1af737 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,13 +1,14 @@
 <?php $TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
-"There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"There is no error, the file uploaded with success" => "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
 "The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
-"No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
-"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
+"No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි",
+"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
-"Delete" => "මකන්න",
+"Share" => "බෙදා හදා ගන්න",
+"Delete" => "මකා දමන්න",
 "Rename" => "නැවත නම් කරන්න",
 "replace" => "ප්‍රතිස්ථාපනය කරන්න",
 "suggest name" => "නමක් යෝජනා කරන්න",
@@ -23,7 +24,7 @@
 "Modified" => "වෙනස් කළ",
 "1 folder" => "1 ෆොල්ඩරයක්",
 "1 file" => "1 ගොනුවක්",
-"Upload" => "උඩුගත කිරීම",
+"Upload" => "උඩුගත කරන්න",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "max. possible: " => "හැකි උපරිමය:",
@@ -38,7 +39,7 @@
 "From link" => "යොමුවෙන්",
 "Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
 "Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
-"Download" => "බාගත කිරීම",
+"Download" => "බාන්න",
 "Unshare" => "නොබෙදු",
 "Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index ee89a4c7d630043eb71ec5d9cb854b6f33ae89e3..ad33c9b4eeedcbda5a008fbe6d6ea498bf882878 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
 "Could not move %s" => "Nie je možné presunúť %s",
-"Unable to rename file" => "Nemožno premenovať súbor",
 "No file was uploaded. Unknown error" => "Žiaden súbor nebol odoslaný. Neznáma chyba",
 "There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor predčil  konfiguračnú direktívu upload_max_filesize v súbore php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári",
-"The uploaded file was only partially uploaded" => "Nahrávaný súbor bol iba čiastočne nahraný",
-"No file was uploaded" => "Žiaden súbor nebol nahraný",
-"Missing a temporary folder" => "Chýbajúci dočasný priečinok",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
+"The uploaded file was only partially uploaded" => "Ukladaný súbor sa nahral len čiastočne",
+"No file was uploaded" => "Žiadny súbor nebol uložený",
+"Missing a temporary folder" => "Chýba dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Not enough storage available" => "Nedostatok dostupného úložného priestoru",
 "Invalid directory." => "Neplatný priečinok",
 "Files" => "Súbory",
+"Share" => "Zdieľať",
 "Delete permanently" => "Zmazať  trvalo",
-"Delete" => "Odstrániť",
+"Delete" => "Zmazať",
 "Rename" => "Premenovať",
-"Pending" => "Čaká sa",
+"Pending" => "Prebieha",
 "{new_name} already exists" => "{new_name} už existuje",
 "replace" => "nahradiť",
 "suggest name" => "pomôcť s menom",
@@ -32,20 +32,22 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov",
 "Not enough space available" => "Nie je k dispozícii dostatok miesta",
 "Upload cancelled." => "Odosielanie zrušené",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
 "URL cannot be empty." => "URL nemôže byť prázdne",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud",
 "Error" => "Chyba",
-"Name" => "Meno",
+"Name" => "Názov",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
 "1 folder" => "1 priečinok",
 "{count} folders" => "{count} priečinkov",
 "1 file" => "1 súbor",
 "{count} files" => "{count} súborov",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud",
+"Unable to rename file" => "Nemožno premenovať súbor",
 "Upload" => "Odoslať",
 "File handling" => "Nastavenie správania sa k súborom",
 "Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
@@ -55,7 +57,7 @@
 "0 is unlimited" => "0 znamená neobmedzené",
 "Maximum input size for ZIP files" => "Najväčšia veľkosť ZIP súborov",
 "Save" => "Uložiť",
-"New" => "Nový",
+"New" => "Nová",
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
 "From link" => "Z odkazu",
@@ -63,9 +65,9 @@
 "Cancel upload" => "Zrušiť odosielanie",
 "You don’t have write permissions here." => "Nemáte oprávnenie na zápis.",
 "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
-"Download" => "Stiahnuť",
-"Unshare" => "Nezdielať",
-"Upload too large" => "Odosielaný súbor je príliš veľký",
+"Download" => "SÅ¥ahovanie",
+"Unshare" => "Zrušiť zdieľanie",
+"Upload too large" => "Nahrávanie je príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
 "Current scanning" => "Práve prezerané",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 65d463e13d4269db9aff6ae5497841099841dcc5..6902d311ab76327b93b19abe746e635283e7df21 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -1,19 +1,19 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja",
 "Could not move %s" => "Ni mogoče premakniti %s",
-"Unable to rename file" => "Ni mogoče preimenovati datoteke",
-"No file was uploaded. Unknown error" => "Ni poslane nobene datoteke. Neznana napaka.",
-"There is no error, the file uploaded with success" => "Datoteka je uspešno poslana.",
+"No file was uploaded. Unknown error" => "Ni poslane datoteke. Neznana napaka.",
+"There is no error, the file uploaded with success" => "Datoteka je uspešno naložena.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.",
-"The uploaded file was only partially uploaded" => "Datoteka je le delno naložena",
-"No file was uploaded" => "Nobena datoteka ni bila naložena",
+"The uploaded file was only partially uploaded" => "Poslan je le del datoteke.",
+"No file was uploaded" => "Ni poslane datoteke",
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Not enough storage available" => "Na voljo ni dovolj prostora",
 "Invalid directory." => "Neveljavna mapa.",
 "Files" => "Datoteke",
-"Delete permanently" => "Izbriši trajno",
+"Share" => "Souporaba",
+"Delete permanently" => "Izbriši dokončno",
 "Delete" => "Izbriši",
 "Rename" => "Preimenuj",
 "Pending" => "V čakanju ...",
@@ -32,7 +32,7 @@
 "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov.",
 "Not enough space available" => "Na voljo ni dovolj prostora.",
 "Upload cancelled." => "Pošiljanje je preklicano.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
+"Unable to rename file" => "Ni mogoče preimenovati datoteke",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",
 "Maximum upload size" => "Največja velikost za pošiljanja",
@@ -55,7 +56,7 @@
 "0 is unlimited" => "0 predstavlja neomejeno vrednost",
 "Maximum input size for ZIP files" => "Največja vhodna velikost za datoteke ZIP",
 "Save" => "Shrani",
-"New" => "Nova",
+"New" => "Novo",
 "Text file" => "Besedilna datoteka",
 "Folder" => "Mapa",
 "From link" => "Iz povezave",
@@ -64,7 +65,7 @@
 "You don’t have write permissions here." => "Za to mesto ni ustreznih dovoljenj za pisanje.",
 "Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
 "Download" => "Prejmi",
-"Unshare" => "Odstrani iz souporabe",
+"Unshare" => "Prekliči souporabo",
 "Upload too large" => "Prekoračenje omejitve velikosti",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
 "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 57c21ba002c7a3d3e470458d87544540bfeb1baf..63c95f692e26842b4b33785d8b02e002a81a2ac5 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër",
 "Could not move %s" => "%s nuk u spostua",
-"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
 "No file was uploaded. Unknown error" => "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur",
 "There is no error, the file uploaded with success" => "Nuk pati veprime të gabuara, skedari u ngarkua me sukses",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon udhëzimin upload_max_filesize tek php.ini:",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "Nuk ka mbetur hapësirë memorizimi e mjaftueshme",
 "Invalid directory." => "Dosje e pavlefshme.",
 "Files" => "Skedarët",
+"Share" => "Nda",
 "Delete permanently" => "Elimino përfundimisht",
 "Delete" => "Elimino",
 "Rename" => "Riemërto",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} dosje",
 "1 file" => "1 skedar",
 "{count} files" => "{count} skedarë",
+"Unable to rename file" => "Nuk është i mundur riemërtimi i skedarit",
 "Upload" => "Ngarko",
 "File handling" => "Trajtimi i skedarit",
 "Maximum upload size" => "Dimensioni maksimal i ngarkimit",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index ff0733e211b2dd7d4055204b0f4aacb0913ec175..3be6dde91a7ed6c1256187bbacca416aee34c1ee 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -1,4 +1,7 @@
 <?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:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу",
@@ -6,7 +9,11 @@
 "No file was uploaded" => "Датотека није отпремљена",
 "Missing a temporary folder" => "Недостаје привремена фасцикла",
 "Failed to write to disk" => "Не могу да пишем на диск",
+"Not enough storage available" => "Нема довољно простора",
+"Invalid directory." => "неисправна фасцикла.",
 "Files" => "Датотеке",
+"Share" => "Дели",
+"Delete permanently" => "Обриши за стално",
 "Delete" => "Обриши",
 "Rename" => "Преименуј",
 "Pending" => "На чекању",
@@ -16,19 +23,30 @@
 "cancel" => "откажи",
 "replaced {new_name} with {old_name}" => "замењено {new_name} са {old_name}",
 "undo" => "опозови",
+"perform delete operation" => "обриши",
 "1 file uploading" => "Отпремам 1 датотеку",
+"files uploading" => "датотеке се отпремају",
+"'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
+"File name cannot be empty." => "Име датотеке не може бити празно.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
+"Your storage is almost full ({usedSpacePercent}%)" => "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова",
+"Not enough space available" => "Нема довољно простора",
 "Upload cancelled." => "Отпремање је прекинуто.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
+"URL cannot be empty." => "Адреса не може бити празна.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud.",
 "Error" => "Грешка",
-"Name" => "Назив",
+"Name" => "Име",
 "Size" => "Величина",
 "Modified" => "Измењено",
 "1 folder" => "1 фасцикла",
 "{count} folders" => "{count} фасцикле/и",
 "1 file" => "1 датотека",
 "{count} files" => "{count} датотеке/а",
+"Unable to rename file" => "Не могу да преименујем датотеку",
 "Upload" => "Отпреми",
 "File handling" => "Управљање датотекама",
 "Maximum upload size" => "Највећа величина датотеке",
@@ -42,12 +60,15 @@
 "Text file" => "текстуална датотека",
 "Folder" => "фасцикла",
 "From link" => "Са везе",
+"Deleted files" => "Обрисане датотеке",
 "Cancel upload" => "Прекини отпремање",
+"You don’t have write permissions here." => "Овде немате дозволу за писање.",
 "Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
 "Download" => "Преузми",
 "Unshare" => "Укини дељење",
 "Upload too large" => "Датотека је превелика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеке које желите да отпремите прелазе ограничење у величини.",
 "Files are being scanned, please wait." => "Скенирам датотеке…",
-"Current scanning" => "Тренутно скенирање"
+"Current scanning" => "Тренутно скенирање",
+"Upgrading filesystem cache..." => "Дограђујем кеш система датотека…"
 );
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 125788ad13dc5dcae062d374fb4caba27f14aa0e..82d169d569c0acbe23b24c29d47a81caedafe535 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
 "Could not move %s" => "Kan inte flytta %s",
-"Unable to rename file" => "Kan inte byta namn på filen",
 "No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
-"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
+"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
 "The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvis uppladdad",
-"No file was uploaded" => "Ingen fil blev uppladdad",
-"Missing a temporary folder" => "Saknar en tillfällig mapp",
+"No file was uploaded" => "Ingen fil laddades upp",
+"Missing a temporary folder" => "En temporär mapp saknas",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
+"Share" => "Dela",
 "Delete permanently" => "Radera permanent",
 "Delete" => "Radera",
 "Rename" => "Byt namn",
@@ -25,13 +25,14 @@
 "undo" => "Ã¥ngra",
 "perform delete operation" => "utför raderingen",
 "1 file uploading" => "1 filuppladdning",
+"files uploading" => "filer laddas upp",
 "'.' 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 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" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
+"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",
 "Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
 "Upload cancelled." => "Uppladdning avbruten.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
@@ -45,6 +46,7 @@
 "{count} folders" => "{count} mappar",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Unable to rename file" => "Kan inte byta namn på filen",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index b88379043d09416438d87d8da0e670d4fdd49b93..e5f7bbdf9bb667ebb623df18bc8901706cfaf59e 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -7,7 +7,8 @@
 "Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
 "Failed to write to disk" => "வட்டில் எழுத முடியவில்லை",
 "Files" => "கோப்புகள்",
-"Delete" => "அழிக்க",
+"Share" => "பகிர்வு",
+"Delete" => "நீக்குக",
 "Rename" => "பெயர்மாற்றம்",
 "Pending" => "நிலுவையிலுள்ள",
 "{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
@@ -38,7 +39,7 @@
 "Enable ZIP-download" => "ZIP பதிவிறக்கலை இயலுமைப்படுத்துக",
 "0 is unlimited" => "0 ஆனது எல்லையற்றது",
 "Maximum input size for ZIP files" => "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு",
-"Save" => "சேமிக்க",
+"Save" => "சேமிக்க ",
 "New" => "புதிய",
 "Text file" => "கோப்பு உரை",
 "Folder" => "கோப்புறை",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 0e7d32bf12da1273a38f1690887f0f3554b9001b..06d26edfec8ea21f483427c4de13b8a062fe38da 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
 "Could not move %s" => "ไม่สามารถย้าย %s ได้",
-"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
 "No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-"There is no error, the file uploaded with success" => "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
+"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML",
-"The uploaded file was only partially uploaded" => "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์",
-"No file was uploaded" => "ยังไม่มีไฟล์ที่ถูกอัพโหลด",
-"Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML",
+"The uploaded file was only partially uploaded" => "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
+"No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
+"Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
 "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
 "Files" => "ไฟล์",
+"Share" => "แชร์",
 "Delete" => "ลบ",
 "Rename" => "เปลี่ยนชื่อ",
 "Pending" => "อยู่ระหว่างดำเนินการ",
@@ -24,13 +24,14 @@
 "undo" => "เลิกทำ",
 "perform delete operation" => "ดำเนินการตามคำสั่งลบ",
 "1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
+"files uploading" => "การอัพโหลดไฟล์",
 "'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
 "File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
 "Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
 "Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
-"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์",
 "Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
 "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
@@ -39,11 +40,12 @@
 "Error" => "ข้อผิดพลาด",
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
-"Modified" => "ปรับปรุงล่าสุด",
+"Modified" => "แก้ไขแล้ว",
 "1 folder" => "1 โฟลเดอร์",
 "{count} folders" => "{count} โฟลเดอร์",
 "1 file" => "1 ไฟล์",
 "{count} files" => "{count} ไฟล์",
+"Unable to rename file" => "ไม่สามารถเปลี่ยนชื่อไฟล์ได้",
 "Upload" => "อัพโหลด",
 "File handling" => "การจัดกาไฟล์",
 "Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
@@ -60,7 +62,7 @@
 "Cancel upload" => "ยกเลิกการอัพโหลด",
 "Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
 "Download" => "ดาวน์โหลด",
-"Unshare" => "ยกเลิกการแชร์ข้อมูล",
+"Unshare" => "ยกเลิกการแชร์",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 84da59cee082201b7e48d84ad744f14d357ba7f9..6a096d270391fb5947399848f0d6b8c5b81a33e8 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
 "Could not move %s" => "%s taşınamadı",
-"Unable to rename file" => "Dosya adı değiştirilemedi",
 "No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
-"There is no error, the file uploaded with success" => "Bir hata yok, dosya başarıyla yüklendi",
+"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor",
-"The uploaded file was only partially uploaded" => "Yüklenen dosyanın sadece bir kısmı yüklendi",
-"No file was uploaded" => "Hiç dosya yüklenmedi",
-"Missing a temporary folder" => "Geçici bir klasör eksik",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
+"The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
+"No file was uploaded" => "Hiç dosya gönderilmedi",
+"Missing a temporary folder" => "Geçici dizin eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Not enough storage available" => "Yeterli disk alanı yok",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
+"Share" => "PaylaÅŸ",
 "Delete permanently" => "Kalıcı olarak sil",
 "Delete" => "Sil",
 "Rename" => "Ä°sim deÄŸiÅŸtir.",
@@ -39,13 +39,15 @@
 "URL cannot be empty." => "URL boÅŸ olamaz.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir.",
 "Error" => "Hata",
-"Name" => "Ad",
+"Name" => "Ä°sim",
 "Size" => "Boyut",
 "Modified" => "DeÄŸiÅŸtirilme",
 "1 folder" => "1 dizin",
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
+"Unable to rename file" => "Dosya adı değiştirilemedi",
 "Upload" => "Yükle",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
@@ -65,7 +67,7 @@
 "Nothing in here. Upload something!" => "Burada hiçbir şey yok. Birşeyler yükleyin!",
 "Download" => "Ä°ndir",
 "Unshare" => "Paylaşılmayan",
-"Upload too large" => "Yüklemeniz çok büyük",
+"Upload too large" => "Yükleme çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
 "Current scanning" => "Güncel tarama",
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..fb8f187adef2623055b1ffaa168aac115cb419eb
--- /dev/null
+++ b/apps/files/l10n/ug.php
@@ -0,0 +1,44 @@
+<?php $TRANSLATIONS = array(
+"Could not move %s" => "%s يۆتكىيەلمەيدۇ",
+"No file was uploaded. Unknown error" => "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
+"No file was uploaded" => "ھېچقانداق ھۆججەت يۈكلەنمىدى",
+"Missing a temporary folder" => "ۋاقىتلىق قىسقۇچ كەم.",
+"Failed to write to disk" => "دىسكىغا يازالمىدى",
+"Not enough storage available" => "يېتەرلىك ساقلاش بوشلۇقى يوق",
+"Files" => "ھۆججەتلەر",
+"Share" => "ھەمبەھىر",
+"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Delete" => "ئۆچۈر",
+"Rename" => "ئات ئۆزگەرت",
+"Pending" => "كۈتۈۋاتىدۇ",
+"{new_name} already exists" => "{new_name} مەۋجۇت",
+"replace" => "ئالماشتۇر",
+"suggest name" => "تەۋسىيە ئات",
+"cancel" => "ۋاز كەچ",
+"undo" => "يېنىۋال",
+"1 file uploading" => "1 ھۆججەت يۈكلىنىۋاتىدۇ",
+"files uploading" => "ھۆججەت يۈكلىنىۋاتىدۇ",
+"Not enough space available" => "يېتەرلىك بوشلۇق يوق",
+"Upload cancelled." => "يۈكلەشتىن ۋاز كەچتى.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
+"Error" => "خاتالىق",
+"Name" => "ئاتى",
+"Size" => "چوڭلۇقى",
+"Modified" => "ئۆزگەرتكەن",
+"1 folder" => "1 قىسقۇچ",
+"1 file" => "1 ھۆججەت",
+"{count} files" => "{count} ھۆججەت",
+"Unable to rename file" => "ھۆججەت ئاتىنى ئۆزگەرتكىلى بولمايدۇ",
+"Upload" => "يۈكلە",
+"Save" => "ساقلا",
+"New" => "يېڭى",
+"Text file" => "تېكىست ھۆججەت",
+"Folder" => "قىسقۇچ",
+"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
+"Cancel upload" => "يۈكلەشتىن ۋاز كەچ",
+"Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
+"Download" => "چۈشۈر",
+"Unshare" => "ھەمبەھىرلىمە",
+"Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
+"Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
+);
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 3c8eef9f36d0d40b34ce741af830e1bdee21b47e..324b28936e75c5f3e2f8d9ddc29d5c8a0f18ee27 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
 "Could not move %s" => "Не вдалося перемістити %s",
-"Unable to rename file" => "Не вдалося перейменувати файл",
 "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: ",
@@ -13,6 +12,7 @@
 "Not enough storage available" => "Місця більше немає",
 "Invalid directory." => "Невірний каталог.",
 "Files" => "Файли",
+"Share" => "Поділитися",
 "Delete permanently" => "Видалити назавжди",
 "Delete" => "Видалити",
 "Rename" => "Перейменувати",
@@ -25,6 +25,7 @@
 "undo" => "відмінити",
 "perform delete operation" => "виконати операцію видалення",
 "1 file uploading" => "1 файл завантажується",
+"files uploading" => "файли завантажуються",
 "'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
 "File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
@@ -45,7 +46,8 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлів",
-"Upload" => "Відвантажити",
+"Unable to rename file" => "Не вдалося перейменувати файл",
+"Upload" => "Вивантажити",
 "File handling" => "Робота з файлами",
 "Maximum upload size" => "Максимальний розмір відвантажень",
 "max. possible: " => "макс.можливе:",
@@ -63,7 +65,7 @@
 "You don’t have write permissions here." => "У вас тут немає прав на запис.",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Download" => "Завантажити",
-"Unshare" => "Заборонити доступ",
+"Unshare" => "Закрити доступ",
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
 "Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index e13a623fecc335ac65e09bcaeca82fe9abb71099..aa87eeda385efc7fd0a155e28808004f47a2b8c8 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error" => "ایرر"
+"Error" => "ایرر",
+"Unshare" => "شئیرنگ ختم کریں"
 );
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 73cf1544924df8b28ca9f6e437c787e113fd6d67..c8aa11295c89a53b250178fec387a46db8af0b38 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên file này trên hệ thống",
+"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
 "Could not move %s" => "Không thể di chuyển %s",
-"Unable to rename file" => "Không thể đổi tên file",
 "No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
-"The uploaded file was only partially uploaded" => "Tập tin tải lên mới chỉ tải lên được một phần",
-"No file was uploaded" => "Không có tập tin nào được tải lên",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
+"The uploaded file was only partially uploaded" => "Các tập tin được tải lên chỉ tải lên được một phần",
+"No file was uploaded" => "Chưa có file nào được tải lên",
 "Missing a temporary folder" => "Không tìm thấy thư mục tạm",
 "Failed to write to disk" => "Không thể ghi ",
 "Not enough storage available" => "Không đủ không gian lưu trữ",
 "Invalid directory." => "Thư mục không hợp lệ",
 "Files" => "Tập tin",
+"Share" => "Chia sẻ",
 "Delete permanently" => "Xóa vĩnh vễn",
 "Delete" => "Xóa",
 "Rename" => "Sửa tên",
-"Pending" => "Chờ",
+"Pending" => "Đang chờ",
 "{new_name} already exists" => "{new_name} đã tồn tại",
 "replace" => "thay thế",
 "suggest name" => "tên gợi ý",
@@ -25,13 +25,15 @@
 "undo" => "lùi lại",
 "perform delete operation" => "thực hiện việc xóa",
 "1 file uploading" => "1 tệp tin đang được tải lên",
+"files uploading" => "tệp tin đang được tải lên",
 "'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
 "File name cannot be empty." => "Tên file không được rỗng",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte",
+"Not enough space available" => "Không đủ chỗ trống cần thiết",
 "Upload cancelled." => "Hủy tải lên",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
 "URL cannot be empty." => "URL không được để trống.",
@@ -44,6 +46,7 @@
 "{count} folders" => "{count} thư mục",
 "1 file" => "1 tập tin",
 "{count} files" => "{count} tập tin",
+"Unable to rename file" => "Không thể đổi tên file",
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -59,12 +62,13 @@
 "From link" => "Từ liên kết",
 "Deleted files" => "File đã bị xóa",
 "Cancel upload" => "Hủy upload",
+"You don’t have write permissions here." => "Bạn không có quyền ghi vào đây.",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
-"Download" => "Tải xuống",
-"Unshare" => "Không chia sẽ",
+"Download" => "Tải về",
+"Unshare" => "Bỏ chia sẻ",
 "Upload too large" => "Tập tin tải lên quá lớn",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
 "Current scanning" => "Hiện tại đang quét",
-"Upgrading filesystem cache..." => "Upgrading filesystem cache..."
+"Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
 );
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 33e21e544cd0bbc90927618893567ac4b716f2e9..0d87975918e4a0705a5871c94b61a79f3dec4246 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -1,15 +1,16 @@
 <?php $TRANSLATIONS = array(
 "No file was uploaded. Unknown error" => "没有上传文件。未知错误",
-"There is no error, the file uploaded with success" => "没有任何错误,文件上传成功了",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了HTML表单指定的MAX_FILE_SIZE",
-"The uploaded file was only partially uploaded" => "文件只有部分被上传",
-"No file was uploaded" => "没有上传完成的文件",
-"Missing a temporary folder" => "丢失了一个临时文件夹",
+"There is no error, the file uploaded with success" => "文件上传成功",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项",
+"The uploaded file was only partially uploaded" => "文件部分上传",
+"No file was uploaded" => "没有上传文件",
+"Missing a temporary folder" => "缺失临时文件夹",
 "Failed to write to disk" => "写磁盘失败",
 "Files" => "文件",
+"Share" => "分享",
 "Delete" => "删除",
 "Rename" => "重命名",
-"Pending" => "Pending",
+"Pending" => "等待中",
 "{new_name} already exists" => "{new_name} 已存在",
 "replace" => "替换",
 "suggest name" => "推荐名称",
@@ -17,12 +18,13 @@
 "replaced {new_name} with {old_name}" => "已用 {old_name} 替换 {new_name}",
 "undo" => "撤销",
 "1 file uploading" => "1 个文件正在上传",
-"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
+"files uploading" => "个文件正在上传",
+"Unable to upload your file as it is a directory or has 0 bytes" => "不能上传您的文件，由于它是文件夹或者为空文件",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "URL cannot be empty." => "网址不能为空。",
 "Error" => "出错",
-"Name" => "名字",
+"Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
 "1 folder" => "1 个文件夹",
@@ -45,8 +47,8 @@
 "Cancel upload" => "取消上传",
 "Nothing in here. Upload something!" => "这里没有东西.上传点什么!",
 "Download" => "下载",
-"Unshare" => "取消共享",
-"Upload too large" => "上传的文件太大了",
+"Unshare" => "取消分享",
+"Upload too large" => "上传过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "你正在试图上传的文件超过了此服务器支持的最大的文件大小.",
 "Files are being scanned, please wait." => "正在扫描文件,请稍候.",
 "Current scanning" => "正在扫描"
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 8740298c622e4fdf785acf0d9a822cc40667043d..c883670e8485f22440438ae3580e36512d4b231c 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -1,22 +1,22 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
 "Could not move %s" => "无法移动 %s",
-"Unable to rename file" => "无法重命名文件",
 "No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
-"There is no error, the file uploaded with success" => "没有发生错误，文件上传成功。",
+"There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE",
-"The uploaded file was only partially uploaded" => "只上传了文件的一部分",
-"No file was uploaded" => "文件没有上传",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
+"The uploaded file was only partially uploaded" => "已上传文件只上传了部分（不完整）",
+"No file was uploaded" => "没有文件被上传",
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Not enough storage available" => "没有足够的存储空间",
 "Invalid directory." => "无效文件夹。",
 "Files" => "文件",
+"Share" => "分享",
 "Delete permanently" => "永久删除",
 "Delete" => "删除",
 "Rename" => "重命名",
-"Pending" => "操作等待中",
+"Pending" => "等待",
 "{new_name} already exists" => "{new_name} 已存在",
 "replace" => "替换",
 "suggest name" => "建议名称",
@@ -25,13 +25,14 @@
 "undo" => "撤销",
 "perform delete operation" => "进行删除操作",
 "1 file uploading" => "1个文件上传中",
+"files uploading" => "文件上传中",
 "'.' is an invalid file name." => "'.' 是一个无效的文件名。",
 "File name cannot be empty." => "文件名不能为空。",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
 "Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满，文件将无法更新或同步！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
-"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
+"Unable to upload your file as it is a directory or has 0 bytes" => "无法上传您的文件，文件夹或者空文件",
 "Not enough space available" => "没有足够可用空间",
 "Upload cancelled." => "上传已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
@@ -45,6 +46,8 @@
 "{count} folders" => "{count} 个文件夹",
 "1 file" => "1 个文件",
 "{count} files" => "{count} 个文件",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
+"Unable to rename file" => "无法重命名文件",
 "Upload" => "上传",
 "File handling" => "文件处理",
 "Maximum upload size" => "最大上传大小",
@@ -63,7 +66,7 @@
 "You don’t have write permissions here." => "您没有写权限",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
 "Download" => "下载",
-"Unshare" => "取消分享",
+"Unshare" => "取消共享",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
index 063acef5f049d4dcdf37d033008251d7ff34e094..caafc74b859dadf611c3e2f7781d9eefa424742b 100644
--- a/apps/files/l10n/zh_HK.php
+++ b/apps/files/l10n/zh_HK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Files" => "文件",
+"Share" => "分享",
 "Delete" => "刪除",
 "Error" => "錯誤",
 "Name" => "名稱",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 978ff3fa0ae9a8810eb82399db06ee09a2b7be0c..0bd207888dc9420479098f7e982e407ef7c96543 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "無法移動 %s - 同名的檔案已經存在",
 "Could not move %s" => "無法移動 %s",
-"Unable to rename file" => "無法重新命名檔案",
 "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: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
 "The uploaded file was only partially uploaded" => "只有檔案的一部分被上傳",
-"No file was uploaded" => "無已上傳檔案",
-"Missing a temporary folder" => "遺失暫存資料夾",
+"No file was uploaded" => "沒有檔案被上傳",
+"Missing a temporary folder" => "找不到暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Not enough storage available" => "儲存空間不足",
 "Invalid directory." => "無效的資料夾。",
 "Files" => "檔案",
+"Share" => "分享",
 "Delete permanently" => "永久刪除",
 "Delete" => "刪除",
 "Rename" => "重新命名",
@@ -34,10 +34,10 @@
 "Your download is being prepared. This might take some time if the files are big." => "正在準備您的下載，若您的檔案較大，將會需要更多時間。",
 "Unable to upload your file as it is a directory or has 0 bytes" => "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0",
 "Not enough space available" => "沒有足夠的可用空間",
-"Upload cancelled." => "上傳取消",
+"Upload cancelled." => "上傳已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中。離開此頁面將會取消上傳。",
-"URL cannot be empty." => "URL 不能為空白.",
-"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 Owncloud 保留",
+"URL cannot be empty." => "URL 不能為空白。",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
 "Error" => "錯誤",
 "Name" => "名稱",
 "Size" => "大小",
@@ -46,6 +46,8 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留",
+"Unable to rename file" => "無法重新命名檔案",
 "Upload" => "上傳",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳檔案大小",
@@ -61,13 +63,13 @@
 "From link" => "從連結",
 "Deleted files" => "已刪除的檔案",
 "Cancel upload" => "取消上傳",
-"You don’t have write permissions here." => "您在這裏沒有編輯權。",
-"Nothing in here. Upload something!" => "沒有任何東西。請上傳內容！",
+"You don’t have write permissions here." => "您在這裡沒有編輯權。",
+"Nothing in here. Upload something!" => "這裡什麼也沒有，上傳一些東西吧！",
 "Download" => "下載",
 "Unshare" => "取消共享",
 "Upload too large" => "上傳過大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。　",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
 "Current scanning" => "目前掃描",
-"Upgrading filesystem cache..." => "正在更新檔案系統快取..."
+"Upgrading filesystem cache..." => "正在升級檔案系統快取..."
 );
diff --git a/apps/files/lib/app.php b/apps/files/lib/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2a4b9c2675dcc3bfe2f510916b7abb322ad5b72
--- /dev/null
+++ b/apps/files/lib/app.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * ownCloud - Core
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Files;
+
+class App {
+	private $l10n;
+	private $view;
+
+	public function __construct($view, $l10n) {
+		$this->view = $view;
+		$this->l10n = $l10n;
+	}
+
+	/**
+	 * rename a file
+	 *
+	 * @param string $dir
+	 * @param string $oldname
+	 * @param string $newname
+	 * @return array
+	 */
+	public function rename($dir, $oldname, $newname) {
+		$result = array(
+			'success' 	=> false,
+			'data'		=> NULL
+		);
+
+		// rename to "/Shared" is denied
+		if( $dir === '/' and $newname === 'Shared' ) {
+			$result['data'] = array(
+				'message'	=> $this->l10n->t("Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+			);
+		} elseif(
+			// rename to "." is denied
+			$newname !== '.' and
+			// rename of  "/Shared" is denied
+			!($dir === '/' and $oldname === 'Shared') and
+			// THEN try to rename
+			$this->view->rename($dir . '/' . $oldname, $dir . '/' . $newname)
+		) {
+			// successful rename
+			$result['success'] = true;
+			$result['data'] = array(
+				'dir'		=> $dir,
+				'file'		=> $oldname,
+				'newname'	=> $newname
+			);
+		} else {
+			// rename failed
+			$result['data'] = array(
+				'message'	=> $this->l10n->t('Unable to rename file')
+			);
+		}
+		return $result;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 69fcb94e68197d05ced7d9dc9c4788c8e3a406c4..b576253f4f0f324cd83d2a8602ed4c0e229bd1e8 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -34,7 +34,7 @@
 						   value="(max <?php p($_['uploadMaxHumanFilesize']); ?>)">
 					<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 					<input type="file" id="file_upload_start" name='files[]'/>
-					<a href="#" class="svg" onclick="return false;"></a>
+					<a href="#" class="svg"></a>
 				</form>
 			</div>
 			<?php if ($_['trash'] ): ?>
@@ -46,7 +46,6 @@
 				<div id="uploadprogressbar"></div>
 				<input type="button" class="stop" style="display:none"
 					value="<?php p($l->t('Cancel upload'));?>"
-					onclick="javascript:Files.cancelUploads();"
 				/>
 			</div>
 		</div>
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 7ea1755d1d7459c8ac8ce2d01c8013328e876671..9886b42e42463f5b34057ebb9677831bbdcceb50 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,5 +1,5 @@
 <?php if(count($_["breadcrumb"])):?>
-	<div class="crumb">
+	<div class="crumb" data-dir=''>
 		<a href="<?php print_unescaped($_['baseURL']); ?>">
 			<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
 		</a>
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
new file mode 100644
index 0000000000000000000000000000000000000000..23e5761ddda44869855bc22a7f13b59caa29ab95
--- /dev/null
+++ b/apps/files/tests/ajax_rename.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * ownCloud - Core
+ *
+ * @author Morris Jobke
+ * @copyright 2013 Morris Jobke morris.jobke@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
+
+	function setUp() {
+		// mock OC_L10n
+		$l10nMock = $this->getMock('\OC_L10N', array('t'), array(), '', false);
+		$l10nMock->expects($this->any())
+			->method('t')
+			->will($this->returnArgument(0));
+		$viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath'), array(), '', false);
+		$viewMock->expects($this->any())
+			->method('normalizePath')
+			->will($this->returnArgument(0));
+		$viewMock->expects($this->any())
+			->method('rename')
+			->will($this->returnValue(true));
+		$this->files = new \OCA\Files\App($viewMock, $l10nMock);
+	}
+
+	/**
+	 * @brief test rename of file/folder named "Shared"
+	 */
+	function testRenameSharedFolder() {
+		$dir = '/';
+		$oldname = 'Shared';
+		$newname = 'new_name';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> false,
+			'data'		=> array('message' => 'Unable to rename file')
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	 * @brief test rename of file/folder named "Shared"
+	 */
+	function testRenameSharedFolderInSubdirectory() {
+		$dir = '/test';
+		$oldname = 'Shared';
+		$newname = 'new_name';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> true,
+			'data'		=> array(
+				'dir'		=> $dir,
+				'file'		=> $oldname,
+				'newname'	=> $newname
+			)
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	 * @brief test rename of file/folder to "Shared"
+	 */
+	function testRenameFolderToShared() {
+		$dir = '/';
+		$oldname = 'oldname';
+		$newname = 'Shared';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> false,
+			'data'		=> array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+
+	/**
+	 * @brief test rename of file/folder
+	 */
+	function testRenameFolder() {
+		$dir = '/';
+		$oldname = 'oldname';
+		$newname = 'newname';
+
+		$result = $this->files->rename($dir, $oldname, $newname);
+		$expected = array(
+			'success'	=> true,
+			'data'		=> array(
+				'dir'		=> $dir,
+				'file'		=> $oldname,
+				'newname'	=> $newname
+			)
+		);
+
+		$this->assertEquals($expected, $result);
+	}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ccacb963e3c535182eba8f5f74470c86abdfc6d
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish.php
@@ -0,0 +1,317 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+require_once 'PEAR.php';
+
+
+/**
+ *
+ * Example usage:
+ * $bf = new Crypt_Blowfish('some secret key!');
+ * $encrypted = $bf->encrypt('this is some example plain text');
+ * $plaintext = $bf->decrypt($encrypted);
+ * echo "plain text: $plaintext";
+ *
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ * @version    @package_version@
+ * @access     public
+ */
+class Crypt_Blowfish
+{
+    /**
+     * P-Array contains 18 32-bit subkeys
+     *
+     * @var array
+     * @access private
+     */
+    var $_P = array();
+    
+    
+    /**
+     * Array of four S-Blocks each containing 256 32-bit entries
+     *
+     * @var array
+     * @access private
+     */
+    var $_S = array();
+
+    /**
+     * Mcrypt td resource
+     *
+     * @var resource
+     * @access private
+     */
+    var $_td = null;
+
+    /**
+     * Initialization vector
+     *
+     * @var string
+     * @access private
+     */
+    var $_iv = null;
+
+    
+    /**
+     * Crypt_Blowfish Constructor
+     * Initializes the Crypt_Blowfish object, and gives a sets
+     * the secret key
+     *
+     * @param string $key
+     * @access public
+     */
+    function Crypt_Blowfish($key)
+    {
+        if (extension_loaded('mcrypt')) {
+            $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
+            $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
+        }
+        $this->setKey($key);
+    }
+    
+    /**
+     * Deprecated isReady method
+     *
+     * @return bool
+     * @access public
+     * @deprecated
+     */
+    function isReady()
+    {
+        return true;
+    }
+    
+    /**
+     * Deprecated init method - init is now a private
+     * method and has been replaced with _init
+     *
+     * @return bool
+     * @access public
+     * @deprecated
+     * @see Crypt_Blowfish::_init()
+     */
+    function init()
+    {
+        $this->_init();
+    }
+    
+    /**
+     * Initializes the Crypt_Blowfish object
+     *
+     * @access private
+     */
+    function _init()
+    {
+        $defaults = new Crypt_Blowfish_DefaultKey();
+        $this->_P = $defaults->P;
+        $this->_S = $defaults->S;
+    }
+            
+    /**
+     * Enciphers a single 64 bit block
+     *
+     * @param int &$Xl
+     * @param int &$Xr
+     * @access private
+     */
+    function _encipher(&$Xl, &$Xr)
+    {
+        for ($i = 0; $i < 16; $i++) {
+            $temp = $Xl ^ $this->_P[$i];
+            $Xl = ((($this->_S[0][($temp>>24) & 255] +
+                            $this->_S[1][($temp>>16) & 255]) ^
+                            $this->_S[2][($temp>>8) & 255]) +
+                            $this->_S[3][$temp & 255]) ^ $Xr;
+            $Xr = $temp;
+        }
+        $Xr = $Xl ^ $this->_P[16];
+        $Xl = $temp ^ $this->_P[17];
+    }
+    
+    
+    /**
+     * Deciphers a single 64 bit block
+     *
+     * @param int &$Xl
+     * @param int &$Xr
+     * @access private
+     */
+    function _decipher(&$Xl, &$Xr)
+    {
+        for ($i = 17; $i > 1; $i--) {
+            $temp = $Xl ^ $this->_P[$i];
+            $Xl = ((($this->_S[0][($temp>>24) & 255] +
+                            $this->_S[1][($temp>>16) & 255]) ^
+                            $this->_S[2][($temp>>8) & 255]) +
+                            $this->_S[3][$temp & 255]) ^ $Xr;
+            $Xr = $temp;
+        }
+        $Xr = $Xl ^ $this->_P[1];
+        $Xl = $temp ^ $this->_P[0];
+    }
+    
+    
+    /**
+     * Encrypts a string
+     *
+     * @param string $plainText
+     * @return string Returns cipher text on success, PEAR_Error on failure
+     * @access public
+     */
+    function encrypt($plainText)
+    {
+        if (!is_string($plainText)) {
+            PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
+        }
+
+        if (extension_loaded('mcrypt')) {
+            return mcrypt_generic($this->_td, $plainText);
+        }
+
+        $cipherText = '';
+        $len = strlen($plainText);
+        $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
+        for ($i = 0; $i < $len; $i += 8) {
+            list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
+            $this->_encipher($Xl, $Xr);
+            $cipherText .= pack("N2", $Xl, $Xr);
+        }
+        return $cipherText;
+    }
+    
+    
+    /**
+     * Decrypts an encrypted string
+     *
+     * @param string $cipherText
+     * @return string Returns plain text on success, PEAR_Error on failure
+     * @access public
+     */
+    function decrypt($cipherText)
+    {
+        if (!is_string($cipherText)) {
+            PEAR::raiseError('Cipher text must be a string', 1, PEAR_ERROR_DIE);
+        }
+
+        if (extension_loaded('mcrypt')) {
+            return mdecrypt_generic($this->_td, $cipherText);
+        }
+
+        $plainText = '';
+        $len = strlen($cipherText);
+        $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
+        for ($i = 0; $i < $len; $i += 8) {
+            list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
+            $this->_decipher($Xl, $Xr);
+            $plainText .= pack("N2", $Xl, $Xr);
+        }
+        return $plainText;
+    }
+    
+    
+    /**
+     * Sets the secret key
+     * The key must be non-zero, and less than or equal to
+     * 56 characters in length.
+     *
+     * @param string $key
+     * @return bool  Returns true on success, PEAR_Error on failure
+     * @access public
+     */
+    function setKey($key)
+    {
+        if (!is_string($key)) {
+            PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
+        }
+
+        $len = strlen($key);
+
+        if ($len > 56 || $len == 0) {
+            PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
+        }
+
+        if (extension_loaded('mcrypt')) {
+            mcrypt_generic_init($this->_td, $key, $this->_iv);
+            return true;
+        }
+
+        require_once 'Blowfish/DefaultKey.php';
+        $this->_init();
+        
+        $k = 0;
+        $data = 0;
+        $datal = 0;
+        $datar = 0;
+        
+        for ($i = 0; $i < 18; $i++) {
+            $data = 0;
+            for ($j = 4; $j > 0; $j--) {
+                    $data = $data << 8 | ord($key{$k});
+                    $k = ($k+1) % $len;
+            }
+            $this->_P[$i] ^= $data;
+        }
+        
+        for ($i = 0; $i <= 16; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_P[$i] = $datal;
+            $this->_P[$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[0][$i] = $datal;
+            $this->_S[0][$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[1][$i] = $datal;
+            $this->_S[1][$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[2][$i] = $datal;
+            $this->_S[2][$i+1] = $datar;
+        }
+        for ($i = 0; $i < 256; $i += 2) {
+            $this->_encipher($datal, $datar);
+            $this->_S[3][$i] = $datal;
+            $this->_S[3][$i+1] = $datar;
+        }
+        
+        return true;
+    }
+    
+}
+
+?>
diff --git a/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
new file mode 100644
index 0000000000000000000000000000000000000000..2ff8ac788a6b62a4abde68d476c673612b8bfe01
--- /dev/null
+++ b/apps/files_encryption/3rdparty/Crypt_Blowfish/Blowfish/DefaultKey.php
@@ -0,0 +1,327 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Crypt_Blowfish allows for encryption and decryption on the fly using
+ * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
+ * PHP extension, it uses only PHP.
+ * Crypt_Blowfish support encryption/decryption with or without a secret key.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ */
+
+
+/**
+ * Class containing default key
+ *
+ * @category   Encryption
+ * @package    Crypt_Blowfish
+ * @author     Matthew Fonda <mfonda@php.net>
+ * @copyright  2005 Matthew Fonda
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @link       http://pear.php.net/package/Crypt_Blowfish
+ * @version    @package_version@
+ * @access     public
+ */
+class Crypt_Blowfish_DefaultKey
+{
+    var $P = array();
+    
+    var $S = array();
+    
+    function Crypt_Blowfish_DefaultKey()
+    {
+        $this->P = array(
+            0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+            0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+            0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+            0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+            0x9216D5D9, 0x8979FB1B
+        );
+        
+        $this->S = array(
+            array(
+                0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+                0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+                0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+                0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+                0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+                0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+                0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+                0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+                0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+                0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+                0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+                0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+                0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+                0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+                0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+                0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+                0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+                0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+                0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+                0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+                0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+                0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+                0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+                0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+                0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+                0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+                0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+                0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+                0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+                0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+                0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+                0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+                0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+                0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+                0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+                0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+                0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+                0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+                0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+                0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+                0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+                0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+                0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+                0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+                0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+                0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+                0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+                0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+                0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+                0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+                0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+                0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+                0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+                0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+                0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+                0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+                0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+                0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+                0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+                0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+                0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+                0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+                0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+                0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
+            ),
+            array(
+                0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+                0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+                0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+                0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+                0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+                0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+                0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+                0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+                0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+                0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+                0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+                0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+                0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+                0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+                0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+                0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+                0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+                0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+                0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+                0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+                0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+                0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+                0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+                0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+                0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+                0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+                0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+                0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+                0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+                0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+                0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+                0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+                0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+                0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+                0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+                0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+                0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+                0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+                0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+                0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+                0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+                0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+                0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+                0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+                0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+                0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+                0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+                0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+                0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+                0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+                0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+                0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+                0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+                0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+                0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+                0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+                0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+                0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+                0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+                0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+                0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+                0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+                0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+                0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
+            ),
+            array(
+                0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+                0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+                0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+                0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+                0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+                0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+                0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+                0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+                0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+                0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+                0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+                0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+                0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+                0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+                0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+                0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+                0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+                0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+                0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+                0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+                0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+                0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+                0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+                0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+                0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+                0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+                0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+                0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+                0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+                0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+                0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+                0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+                0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+                0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+                0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+                0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+                0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+                0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+                0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+                0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+                0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+                0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+                0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+                0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+                0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+                0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+                0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+                0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+                0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+                0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+                0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+                0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+                0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+                0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+                0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+                0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+                0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+                0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+                0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+                0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+                0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+                0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+                0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+                0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
+            ),
+            array(
+                0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+                0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+                0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+                0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+                0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+                0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+                0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+                0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+                0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+                0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+                0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+                0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+                0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+                0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+                0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+                0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+                0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+                0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+                0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+                0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+                0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+                0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+                0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+                0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+                0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+                0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+                0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+                0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+                0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+                0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+                0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+                0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+                0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+                0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+                0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+                0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+                0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+                0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+                0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+                0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+                0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+                0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+                0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+                0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+                0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+                0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+                0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+                0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+                0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+                0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+                0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+                0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+                0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+                0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+                0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+                0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+                0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+                0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+                0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+                0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+                0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+                0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+                0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+                0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
+            )
+        );
+    }
+    
+}
+
+?>
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
new file mode 100644
index 0000000000000000000000000000000000000000..6a0186d5a9b1b14d343a486eeb3ac22903cccba9
--- /dev/null
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+use OCA\Encryption;
+
+\OCP\JSON::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l = OC_L10N::get('files_encryption');
+
+$return = false;
+// Enable recoveryAdmin
+
+$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') {
+
+	$return = \OCA\Encryption\Helper::adminEnableRecovery($recoveryKeyId, $_POST['recoveryPassword']);
+
+	// Return success or failure
+	if ($return) {
+		\OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully enabled'))));
+	} else {
+		\OCP\JSON::error(array(
+							  'data' => array(
+								  'message' => $l->t(
+									  'Could not enable recovery key. Please check your recovery key password!')
+							  )
+						 ));
+	}
+
+// Disable recoveryAdmin
+} elseif (
+	isset($_POST['adminEnableRecovery'])
+	&& '0' === $_POST['adminEnableRecovery']
+) {
+	$return = \OCA\Encryption\Helper::adminDisableRecovery($_POST['recoveryPassword']);
+
+	// Return success or failure
+	if ($return) {
+		\OCP\JSON::success(array('data' => array('message' => $l->t('Recovery key successfully disabled'))));
+	} else {
+		\OCP\JSON::error(array(
+							  'data' => array(
+								  'message' => $l->t(
+									  'Could not disable recovery key. Please check your recovery key password!')
+							  )
+						 ));
+	}
+}
+
+
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0594f967ba30c88ff067ef122ba8f4b445eca50
--- /dev/null
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -0,0 +1,52 @@
+<?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::checkAdminUser();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l = OC_L10N::get('core');
+
+$return = false;
+
+$oldPassword = $_POST['oldPassword'];
+$newPassword = $_POST['newPassword'];
+
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+
+$result = $util->checkRecoveryPassword($oldPassword);
+
+if ($result) {
+	$keyId = $util->getRecoveryKeyId();
+	$keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
+	$view = new \OC\Files\View('/');
+
+	$proxyStatus = \OC_FileProxy::$enabled;
+	\OC_FileProxy::$enabled = false;
+
+	$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;
+}
+
+// success or failure
+if ($return) {
+	\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
+} else {
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Could not change the password. Maybe the old password was not correct.'))));
+}
\ No newline at end of file
diff --git a/apps/files_encryption/ajax/userrecovery.php b/apps/files_encryption/ajax/userrecovery.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d0f1ac2d17219c044942f33cc84c6df36a296ab
--- /dev/null
+++ b/apps/files_encryption/ajax/userrecovery.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to handle admin settings for encrypted key recovery
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+if (
+	isset($_POST['userEnableRecovery'])
+	&& (0 == $_POST['userEnableRecovery'] || '1' === $_POST['userEnableRecovery'])
+) {
+
+	$userId = \OCP\USER::getUser();
+	$view = new \OC_FilesystemView('/');
+	$util = new \OCA\Encryption\Util($view, $userId);
+
+	// Save recovery preference to DB
+	$return = $util->setRecoveryForUser($_POST['userEnableRecovery']);
+
+	if ($_POST['userEnableRecovery'] === '1') {
+		$util->addRecoveryKeys();
+	} else {
+		$util->removeRecoveryKeys();
+	}
+
+} else {
+
+	$return = false;
+
+}
+
+// Return success or failure
+($return) ? \OCP\JSON::success() : \OCP\JSON::error();
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index bf16fec3aea0d60678d0a26d8121c9cbd0413868..99bdc2c24702fdea6f15ff29a78d2a225bcf0f67 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -8,42 +8,50 @@ OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
 OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
 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() );
+OC_FileProxy::register(new OCA\Encryption\Proxy());
 
-// User-related hooks
-OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
+// User related hooks
+OCA\Encryption\Helper::registerUserHooks();
 
-// Sharing-related hooks
-OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshare', 'OCA\Encryption\Hooks', 'preUnshare' );
-OCP\Util::connectHook( 'OCP\Share', 'pre_unshareAll', 'OCA\Encryption\Hooks', 'preUnshareAll' );
+// Sharing related hooks
+OCA\Encryption\Helper::registerShareHooks();
 
-// Webdav-related hooks
-OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
+// Filesystem related hooks
+OCA\Encryption\Helper::registerFilesystemHooks();
 
-stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
+stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
 
-$session = new OCA\Encryption\Session();
+// check if we are logged in
+if (OCP\User::isLoggedIn()) {
 
-if ( 
-	! $session->getPrivateKey( \OCP\USER::getUser() )
-	&& OCP\User::isLoggedIn() 
-	&& OCA\Encryption\Crypt::mode() == 'server' 
-) {
+	// ensure filesystem is loaded
+	if(!\OC\Files\Filesystem::$loaded) {
+		\OC_Util::setupFS();
+	}
 
-	// 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.'/' );
-	
-	exit();
+	$view = new OC_FilesystemView('/');
+	$session = new \OCA\Encryption\Session($view);
 
+	// check if user has a private key
+	if (
+		!$session->getPrivateKey(\OCP\USER::getUser())
+		&& OCA\Encryption\Crypt::mode() === 'server'
+	) {
+
+		// 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 . '/');
+
+		exit();
+	}
 }
 
 // Register settings scripts
-OCP\App::registerAdmin( 'files_encryption', 'settings' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
+OCP\App::registerAdmin('files_encryption', 'settings-admin');
+OCP\App::registerPersonal('files_encryption', 'settings-personal');
+
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index d294c35d63d0052e14cc188cebb3603822113aac..4587930da0a3c25fb3eecbb4c39afebf9de866ec 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -18,6 +18,21 @@
 				<type>text</type>
 				<notnull>true</notnull>
 				<length>64</length>
+				<comments>What client-side / server-side configuration is used</comments>
+			</field>
+			<field>
+				<name>recovery_enabled</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<default>0</default>
+				<comments>Whether encryption key recovery is enabled</comments>
+			</field>
+			<field>
+				<name>migration_status</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<default>0</default>
+				<comments>Whether encryption migration has been performed</comments>
 			</field>
 		</declaration>
 	</table>
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 39ea155488f4f1944a152cc4b85b49bd0394b5fb..ea8f6cf6f310373685427f40ed18481c49c9d3c8 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,9 +2,9 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. 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. Encryption is not yet compatible with LDAP.</description>
 	<licence>AGPL</licence>
-	<author>Sam Tuke</author>
+	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>
 	<shipped>true</shipped>
 	<types>
diff --git a/apps/files_encryption/appinfo/spec.txt b/apps/files_encryption/appinfo/spec.txt
index 2d22dffe08da9d3e1a331aff5166aa9dfd05e16c..ddd3983a9eba2f2e33850d0fe57532093e7c7584 100644
--- a/apps/files_encryption/appinfo/spec.txt
+++ b/apps/files_encryption/appinfo/spec.txt
@@ -9,6 +9,57 @@ Encrypted files
 
   [encrypted data string][delimiter][IV][padding]
   [anhAAjAmcGXqj1X9g==][00iv00][MSHU5N5gECP7aAg7][xx] (square braces added)
+  
+- Directory structure:
+  - Encrypted user data (catfiles) are stored in the usual /data/user/files dir
+  - Keyfiles are stored in /data/user/files_encryption/keyfiles
+  - Sharekey are stored in /data/user/files_encryption/share-files
+  
+- File extensions:
+  - Catfiles have to keep the file extension of the original file, pre-encryption
+  - Keyfiles use .keyfile
+  - Sharekeys have .shareKey
+  
+Shared files
+------------
+
+Shared files have a centrally stored catfile and keyfile, and one sharekey for 
+each user that shares it.
+
+When sharing is used, a different encryption method is used to encrypt the 
+keyfile (openssl_seal). Although shared files have a keyfile, its contents
+use a different format therefore.
+
+Each time a shared file is edited or deleted, all sharekeys for users sharing
+that file must have their sharekeys changed also. The keyfile and catfile 
+however need only changing in the owners files, as there is only one copy of
+these.
+
+Publicly shared files (public links)
+------------------------------------
+
+Files shared via public links use a separate system user account called 'ownCloud'. All public files are shared to that user's public key, and the private key is used to access the files when the public link is used in browser.
+
+This means that files shared via public links are accessible only to users who know the shared URL, or to admins who know the 'ownCloud' user password.
+
+Lost password recovery
+----------------------
+
+In order to enable users to read their encrypted files in the event of a password loss/reset scenario, administrators can choose to enable a 'recoveryAdmin' account. This is a user that all user files will automatically be shared to of the option is enabled. This allows the recoveryAdmin user to generate new keyfiles for the user. By default the UID of the recoveryAdmin is 'recoveryAdmin'.
+
+OC_FilesystemView
+-----------------
+
+files_encryption deals extensively with paths and the filesystem. In order to minimise bugs, it makes calls to filesystem methods in a consistent way: OC_FilesystemView{} objects always use '/' as their root, and specify paths each time particular methods are called. e.g. do this:
+
+$view->file_exists( 'path/to/file' );
+
+Not:
+
+$view->chroot( 'path/to' );
+$view->file_exists( 'file' );
+
+Using this convention means that $view objects are more predictable and less likely to break. Problems with paths are the #1 cause of bugs in this app, and consistent $view handling is an important way to prevent them.
 
 Notes
 -----
@@ -16,4 +67,11 @@ Notes
 - The user passphrase is required in order to set up or upgrade the app. New 
   keypair generation, and the re-encryption of legacy encrypted files requires
   it. Therefore an appinfo/update.php script cannot be used, and upgrade logic
-  is handled in the login hook listener.
\ No newline at end of file
+  is handled in the login hook listener. Therefore each time the user logs in 
+  their files are scanned to detect unencrypted and legacy encrypted files, and 
+  they are (re)encrypted as necessary. This may present a performance issue; we
+  need to monitor this.
+- When files are saved to ownCloud via WebDAV, a .part file extension is used so
+  that the file isn't cached before the upload has been completed. .part files 
+  are not compatible with files_encrytion's key management system however, so 
+  we have to always sanitise such paths manually before using them.
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index 1d71ef97443918d538e8188167c94d7bbafaf753..bd73f47072b1fe4b9914ec14a7f6d47fcc8f816a 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.3
\ No newline at end of file
+0.4
diff --git a/apps/files_encryption/css/settings-personal.css b/apps/files_encryption/css/settings-personal.css
new file mode 100644
index 0000000000000000000000000000000000000000..4ee0acc9768ce52dc9262764086ecc2f66400b1d
--- /dev/null
+++ b/apps/files_encryption/css/settings-personal.css
@@ -0,0 +1,10 @@
+/* Copyright (c) 2013, Sam Tuke, <samtuke@owncloud.com>
+ This file is licensed under the Affero General Public License version 3 or later.
+ See the COPYING-README file. */
+
+#encryptAllError
+, #encryptAllSuccess
+, #recoveryEnabledError
+, #recoveryEnabledSuccess {
+	display: none;
+}
\ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 2731d5a92f74ad4ed435d77a37d35cc9018cb7df..d1b08a0b9788d9261b1a01decd384f5b917d6d86 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -23,10 +23,11 @@
 
 namespace OCA\Encryption;
 
+use OC\Files\Filesystem;
+
 /**
  * Class for hook specific logic
  */
-
 class Hooks {
 
 	// TODO: use passphrase for encrypting private key that is separate to 
@@ -36,156 +37,489 @@ class Hooks {
 	 * @brief Startup encryption backend upon user login
 	 * @note This method should never be called for users using client side encryption
 	 */
-	public static function login( $params ) {
-	
+	public static function login($params) {
+
 		// Manually initialise Filesystem{} singleton with correct 
 		// fake root path, in order to avoid fatal webdav errors
-		\OC\Files\Filesystem::init( $params['uid'], $params['uid'] . '/' . 'files' . '/' );
-	
-		$view = new \OC_FilesystemView( '/' );
-
-		$util = new Util( $view, $params['uid'] );
-		
-		// Check files_encryption infrastructure is ready for action
-		if ( ! $util->ready() ) {
-			
-			\OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
-			
-			return $util->setupServerSide( $params['password'] );
+		// NOTE: disabled because this give errors on webdav!
+		//\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
 
+		$view = new \OC_FilesystemView('/');
+
+		// ensure filesystem is loaded
+		if(!\OC\Files\Filesystem::$loaded) {
+			\OC_Util::setupFS($params['uid']);
 		}
-	
-		\OC_FileProxy::$enabled = false;
-		
-		$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
-		
-		\OC_FileProxy::$enabled = true;
-		
-		$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
-		
-		$session = new Session();
-		
-		$session->setPrivateKey( $privateKey, $params['uid'] );
-		
-		$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
-		
-		// Set legacy encryption key if it exists, to support 
-		// depreciated encryption system
-		if ( 
-			$view1->file_exists( 'encryption.key' )
-			&& $encLegacyKey = $view1->file_get_contents( 'encryption.key' ) 
-		) {
-		
-			$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
-			
-			$session->setLegacyKey( $plainLegacyKey );
-		
+
+		$util = new Util($view, $params['uid']);
+
+		// setup user, if user not ready force relogin
+		if (Helper::setupUser($util, $params['password']) === false) {
+			return false;
 		}
-		
-		$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
-		
-		// Encrypt existing user files:
-		// This serves to upgrade old versions of the encryption
-		// app (see appinfo/spec.txt)
-		if ( 
-			$util->encryptAll( $publicKey,  '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )
-		) {
-			
-			\OC_Log::write( 
-				'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" started at login'
-				, \OC_Log::INFO 
-			);
-		
+
+		$encryptedKey = Keymanager::getPrivateKey($view, $params['uid']);
+
+		$privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $params['password']);
+
+		$session = new \OCA\Encryption\Session($view);
+
+		$session->setPrivateKey($privateKey, $params['uid']);
+
+		// Check if first-run file migration has already been performed
+		$migrationCompleted = $util->getMigrationStatus();
+
+		// If migration not yet done
+		if (!$migrationCompleted) {
+
+			$userView = new \OC_FilesystemView('/' . $params['uid']);
+
+			// Set legacy encryption key if it exists, to support 
+			// depreciated encryption system
+			if (
+				$userView->file_exists('encryption.key')
+				&& $encLegacyKey = $userView->file_get_contents('encryption.key')
+			) {
+
+				$plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);
+
+				$session->setLegacyKey($plainLegacyKey);
+
+			}
+
+			// Encrypt existing user files:
+			// This serves to upgrade old versions of the encryption
+			// app (see appinfo/spec.txt)
+			if (
+				$util->encryptAll('/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'])
+			) {
+
+				\OC_Log::write(
+					'Encryption library', 'Encryption of existing files belonging to "' . $params['uid'] . '" completed'
+					, \OC_Log::INFO
+				);
+
+			}
+
+			// Register successful migration in DB
+			$util->setMigrationStatus(1);
+
 		}
 
 		return true;
 
 	}
-	
+
+	/**
+	 * @brief setup encryption backend upon user created
+	 * @note This method should never be called for users using client side encryption
+	 */
+	public static function postCreateUser($params) {
+		$view = new \OC_FilesystemView('/');
+
+		$util = new Util($view, $params['uid']);
+
+		Helper::setupUser($util, $params['password']);
+	}
+
+	/**
+	 * @brief cleanup encryption backend upon user deleted
+	 * @note This method should never be called for users using client side encryption
+	 */
+	public static function postDeleteUser($params) {
+		$view = new \OC_FilesystemView('/');
+
+		// cleanup public key
+		$publicKey = '/public-keys/' . $params['uid'] . '.public.key';
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$view->unlink($publicKey);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+	}
+
 	/**
 	 * @brief Change a user's encryption passphrase
 	 * @param array $params keys: uid, password
 	 */
-	public static function setPassphrase( $params ) {
-		
+	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 
 		// the necessary keys)
-		if ( Crypt::mode() == 'server' ) {
-			
-			$session = new Session();
-			
-			// Get existing decrypted private key
-			$privateKey = $session->getPrivateKey();
-			
-			// Encrypt private key with new user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
-			
-			// Save private key
-			Keymanager::setPrivateKey( $encryptedPrivateKey );
-			
-			// NOTE: Session does not need to be updated as the 
-			// private key has not changed, only the passphrase 
-			// used to decrypt it has changed
-			
+		if (Crypt::mode() === 'server') {
+
+			if ($params['uid'] === \OCP\User::getUser()) {
+
+				$view = new \OC_FilesystemView('/');
+
+				$session = new \OCA\Encryption\Session($view);
+
+				// Get existing decrypted private key
+				$privateKey = $session->getPrivateKey();
+
+				// Encrypt private key with new user pwd as passphrase
+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($privateKey, $params['password']);
+
+				// Save private key
+				Keymanager::setPrivateKey($encryptedPrivateKey);
+
+				// NOTE: Session does not need to be updated as the
+				// private key has not changed, only the passphrase
+				// used to decrypt it has changed
+
+
+			} else { // admin changed the password for a different user, create new keys and reencrypt file keys
+
+				$user = $params['uid'];
+				$recoveryPassword = $params['recoveryPassword'];
+				$newUserPassword = $params['password'];
+
+				$view = new \OC_FilesystemView('/');
+
+				// make sure that the users home is mounted
+				\OC\Files\Filesystem::initMountPoints($user);
+
+				$keypair = Crypt::createKeypair();
+
+				// Disable encryption proxy to prevent recursive calls
+				$proxyStatus = \OC_FileProxy::$enabled;
+				\OC_FileProxy::$enabled = false;
+
+				// Save public key
+				$view->file_put_contents('/public-keys/' . $user . '.public.key', $keypair['publicKey']);
+
+				// Encrypt private key empty passphrase
+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword);
+
+				// Save private key
+				$view->file_put_contents(
+					'/' . $user . '/files_encryption/' . $user . '.private.key', $encryptedPrivateKey);
+
+				if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
+					$util = new Util($view, $user);
+					$util->recoverUsersFiles($recoveryPassword);
+				}
+
+				\OC_FileProxy::$enabled = $proxyStatus;
+			}
 		}
-	
 	}
-	
+
+	/*
+	 * @brief check if files can be encrypted to every user.
+	 */
 	/**
-	 * @brief update the encryption key of the file uploaded by the client
+	 * @param $params
 	 */
-	public static function updateKeyfile( $params ) {
-	
-		if ( Crypt::mode() == 'client' ) {
-			
-			if ( isset( $params['properties']['key'] ) ) {
-				
-				$view = new \OC_FilesystemView( '/' );
-				$userId = \OCP\User::getUser();
-				
-				Keymanager::setFileKey( $view, $params['path'], $userId, $params['properties']['key'] );
-				
-			} else {
-				
-				\OC_Log::write( 
-					'Encryption library', "Client side encryption is enabled but the client doesn't provide a encryption key for the file!"
-					, \OC_Log::ERROR 
-				);
-				
-				error_log( "Client side encryption is enabled but the client doesn't provide an encryption key for the file!" );
-				
+	public static function preShared($params) {
+
+		$users = array();
+		$view = new \OC\Files\View('/public-keys/');
+
+		switch ($params['shareType']) {
+			case \OCP\Share::SHARE_TYPE_USER:
+				$users[] = $params['shareWith'];
+				break;
+			case \OCP\Share::SHARE_TYPE_GROUP:
+				$users = \OC_Group::usersInGroup($params['shareWith']);
+				break;
+		}
+
+		$error = false;
+		foreach ($users as $user) {
+			if (!$view->file_exists($user . '.public.key')) {
+				$error = true;
+				break;
 			}
-			
 		}
-		
+
+		if ($error) // Set flag var 'run' to notify emitting
+			// script that hook execution failed
+		{
+			$params['run']->run = false;
+		}
+		// TODO: Make sure files_sharing provides user
+		// feedback on failed share
 	}
-	
+
 	/**
-	 * @brief 
+	 * @brief
 	 */
-	public static function postShared( $params ) {
+	public static function postShared($params) {
+
+		// NOTE: $params has keys:
+		// [itemType] => file
+		// itemSource -> int, filecache file ID
+		// [parent] => 
+		// [itemTarget] => /13
+		// shareWith -> string, uid of user being shared to
+		// fileTarget -> path of file being shared
+		// uidOwner -> owner of the original file being shared
+		// [shareType] => 0
+		// [shareWith] => test1
+		// [uidOwner] => admin
+		// [permissions] => 17
+		// [fileSource] => 13
+		// [fileTarget] => /test8
+		// [id] => 10
+		// [token] =>
+		// [run] => whether emitting script should continue to run
+		// TODO: Should other kinds of item be encrypted too?
+
+		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+			$view = new \OC_FilesystemView('/');
+			$session = new \OCA\Encryption\Session($view);
+			$userId = \OCP\User::getUser();
+			$util = new Util($view, $userId);
+			$path = $util->fileIdToPath($params['itemSource']);
+
+			$share = $util->getParentFromShare($params['id']);
+			//if parent is set, then this is a re-share action
+			if ($share['parent'] !== null) {
+
+				// get the parent from current share
+				$parent = $util->getShareParent($params['parent']);
+
+				// if parent is file the it is an 1:1 share
+				if ($parent['item_type'] === 'file') {
+
+					// prefix path with Shared
+					$path = '/Shared' . $parent['file_target'];
+				} else {
+
+					// NOTE: parent is folder but shared was a file!
+					// we try to rebuild the missing path
+					// some examples we face here
+					// user1 share folder1 with user2 folder1 has 
+					// the following structure 
+					// /folder1/subfolder1/subsubfolder1/somefile.txt
+					// user2 re-share subfolder2 with user3
+					// user3 re-share somefile.txt user4
+					// so our path should be 
+					// /Shared/subfolder1/subsubfolder1/somefile.txt 
+					// while user3 is sharing
+
+					if ($params['itemType'] === 'file') {
+						// get target path
+						$targetPath = $util->fileIdToPath($params['fileSource']);
+						$targetPathSplit = array_reverse(explode('/', $targetPath));
+
+						// init values
+						$path = '';
+						$sharedPart = ltrim($parent['file_target'], '/');
+
+						// rebuild path
+						foreach ($targetPathSplit as $pathPart) {
+							if ($pathPart !== $sharedPart) {
+								$path = '/' . $pathPart . $path;
+							} else {
+								break;
+							}
+						}
+						// prefix path with Shared
+						$path = '/Shared' . $parent['file_target'] . $path;
+					} else {
+						// prefix path with Shared
+						$path = '/Shared' . $parent['file_target'] . $params['fileTarget'];
+					}
+				}
+			}
+
+			$sharingEnabled = \OCP\Share::isEnabled();
+
+			// get the path including mount point only if not a shared folder
+			if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {
+				// get path including the the storage mount point
+				$path = $util->getPathWithMountPoint($params['itemSource']);
+			}
+
+			// if a folder was shared, get a list of all (sub-)folders
+			if ($params['itemType'] === 'folder') {
+				$allFiles = $util->getAllFiles($path);
+			} else {
+				$allFiles = array($path);
+			}
+
+			foreach ($allFiles as $path) {
+				$usersSharing = $util->getSharingUsersArray($sharingEnabled, $path);
+				$util->setSharedFileKeyfiles($session, $usersSharing, $path);
+			}
+		}
 	}
-	
+
 	/**
-	 * @brief 
+	 * @brief
 	 */
-	public static function preUnshare( $params ) {
-		
-		// Delete existing catfile
-		
-		// Generate new catfile and env keys
-		
-		// Save env keys to user folders
+	public static function postUnshare($params) {
+
+		// NOTE: $params has keys:
+		// [itemType] => file
+		// [itemSource] => 13
+		// [shareType] => 0
+		// [shareWith] => test1
+		// [itemParent] =>
+
+		if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+
+			$view = new \OC_FilesystemView('/');
+			$userId = \OCP\User::getUser();
+			$util = new Util($view, $userId);
+			$path = $util->fileIdToPath($params['itemSource']);
+
+			// check if this is a re-share
+			if ($params['itemParent']) {
+
+				// get the parent from current share
+				$parent = $util->getShareParent($params['itemParent']);
+
+				// get target path
+				$targetPath = $util->fileIdToPath($params['itemSource']);
+				$targetPathSplit = array_reverse(explode('/', $targetPath));
+
+				// init values
+				$path = '';
+				$sharedPart = ltrim($parent['file_target'], '/');
+
+				// rebuild path
+				foreach ($targetPathSplit as $pathPart) {
+					if ($pathPart !== $sharedPart) {
+						$path = '/' . $pathPart . $path;
+					} else {
+						break;
+					}
+				}
+
+				// prefix path with Shared
+				$path = '/Shared' . $parent['file_target'] . $path;
+			}
+
+			// for group shares get a list of the group members
+			if ($params['shareType'] === \OCP\Share::SHARE_TYPE_GROUP) {
+				$userIds = \OC_Group::usersInGroup($params['shareWith']);
+			} else {
+				if ($params['shareType'] === \OCP\Share::SHARE_TYPE_LINK) {
+					$userIds = array($util->getPublicShareKeyId());
+				} else {
+					$userIds = array($params['shareWith']);
+				}
+			}
+
+			// get the path including mount point only if not a shared folder
+			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 );
+			} else {
+				$allFiles = array($path);
+			}
+
+			foreach ($allFiles as $path) {
+
+				// check if the user still has access to the file, otherwise delete share key
+				$sharingUsers = $util->getSharingUsersArray(true, $path);
+
+				// Unshare every user who no longer has access to the file
+				$delUsers = array_diff($userIds, $sharingUsers);
+
+				// delete share key
+				Keymanager::delShareKey($view, $delUsers, $path);
+			}
+
+		}
 	}
-	
+
 	/**
-	 * @brief 
+	 * @brief after a file is renamed, rename its keyfile and share-keys also fix the file size and fix also the sharing
+	 * @param array with oldpath and newpath
+	 *
+	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+	 * of the stored versions along the actual file
 	 */
-	public static function preUnshareAll( $params ) {
-		
-		trigger_error( "preUnshareAll" );
-		
+	public static function postRename($params) {
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$view = new \OC_FilesystemView('/');
+		$session = new \OCA\Encryption\Session($view);
+		$userId = \OCP\User::getUser();
+		$util = new Util($view, $userId);
+
+		// Format paths to be relative to user files dir
+		$oldKeyfilePath = \OC\Files\Filesystem::normalizePath(
+			$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['oldpath']);
+		$newKeyfilePath = \OC\Files\Filesystem::normalizePath(
+			$userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $params['newpath']);
+
+		// add key ext if this is not an folder
+		if (!$view->is_dir($oldKeyfilePath)) {
+			$oldKeyfilePath .= '.key';
+			$newKeyfilePath .= '.key';
+
+			// handle share-keys
+			$localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $params['oldpath']);
+			$matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+			foreach ($matches as $src) {
+				$dst = \OC\Files\Filesystem::normalizePath(str_replace($params['oldpath'], $params['newpath'], $src));
+
+				// create destination folder if not exists
+				if (!file_exists(dirname($dst))) {
+					mkdir(dirname($dst), 0750, true);
+				}
+
+				rename($src, $dst);
+			}
+
+		} else {
+			// handle share-keys folders
+			$oldShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
+				$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['oldpath']);
+			$newShareKeyfilePath = \OC\Files\Filesystem::normalizePath(
+				$userId . '/' . 'files_encryption' . '/' . 'share-keys' . '/' . $params['newpath']);
+
+			// create destination folder if not exists
+			if (!$view->file_exists(dirname($newShareKeyfilePath))) {
+				$view->mkdir(dirname($newShareKeyfilePath), 0750, true);
+			}
+
+			$view->rename($oldShareKeyfilePath, $newShareKeyfilePath);
+		}
+
+		// Rename keyfile so it isn't orphaned
+		if ($view->file_exists($oldKeyfilePath)) {
+
+			// create destination folder if not exists
+			if (!$view->file_exists(dirname($newKeyfilePath))) {
+				$view->mkdir(dirname($newKeyfilePath), 0750, true);
+			}
+
+			$view->rename($oldKeyfilePath, $newKeyfilePath);
+		}
+
+		// build the path to the file
+		$newPath = '/' . $userId . '/files' . $params['newpath'];
+		$newPathRelative = $params['newpath'];
+
+		if ($util->fixFileSize($newPath)) {
+			// get sharing app state
+			$sharingEnabled = \OCP\Share::isEnabled();
+
+			// get users
+			$usersSharing = $util->getSharingUsersArray($sharingEnabled, $newPathRelative);
+
+			// update sharing-keys
+			$util->setSharedFileKeyfiles($session, $usersSharing, $newPathRelative);
+		}
+
+		\OC_FileProxy::$enabled = $proxyStatus;
 	}
-	
 }
diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c1866445eee9133cf090a0a0bc0757d6e33aa22
--- /dev/null
+++ b/apps/files_encryption/js/settings-admin.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>, Robin Appelman 
+ * <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+OC.msg={
+	startSaving:function(selector){
+		$(selector)
+			.html( t('settings', 'Saving...') )
+			.removeClass('success')
+			.removeClass('error')
+			.stop(true, true)
+			.show();
+	},
+	finishedSaving:function(selector, data){
+		if( data.status === "success" ){
+			 $(selector).html( data.data.message )
+				.addClass('success')
+				.stop(true, true)
+				.delay(3000)
+				.fadeOut(900);
+		}else{
+			$(selector).html( data.data.message ).addClass('error');
+		}
+	}
+};
+
+$(document).ready(function(){
+	// Trigger ajax on recoveryAdmin status change
+	var enabledStatus = $('#adminEnableRecovery').val();
+
+	$('input:password[name="recoveryPassword"]').keyup(function(event) {
+		var recoveryPassword = $( '#recoveryPassword' ).val();
+		var checkedButton = $('input:radio[name="adminEnableRecovery"]:checked').val();
+		var uncheckedValue = (1+parseInt(checkedButton)) % 2;
+		if (recoveryPassword != '' ) {
+			$('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').removeAttr("disabled");
+		} else {
+			$('input:radio[name="adminEnableRecovery"][value="'+uncheckedValue.toString()+'"]').attr("disabled", "true");
+		}
+	});
+
+	$( 'input:radio[name="adminEnableRecovery"]' ).change( 
+		function() {
+			var recoveryStatus = $( this ).val();
+			var oldStatus = (1+parseInt(recoveryStatus)) % 2;
+			var recoveryPassword = $( '#recoveryPassword' ).val();
+			$.post(
+				OC.filePath( 'files_encryption', 'ajax', 'adminrecovery.php' )
+				, { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword }
+				,  function( result ) {
+					if (result.status === "error") {
+						OC.Notification.show(t('admin', result.data.message));
+						$('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
+					} else {
+						OC.Notification.hide();
+						if (recoveryStatus === "0") {
+							$('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+							$('input:password[name="changeRecoveryPassword"]').attr("disabled", "true");
+							$('input:password[name="changeRecoveryPassword"]').val("");
+						} else {
+							$('input:password[name="changeRecoveryPassword"]').removeAttr("disabled");
+						}
+					}
+				}
+			);
+		}
+	);
+
+	// change recovery password
+
+	$('input:password[name="changeRecoveryPassword"]').keyup(function(event) {
+		var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+		var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+		if (newRecoveryPassword != '' && oldRecoveryPassword != '' ) {
+			$('button:button[name="submitChangeRecoveryKey"]').removeAttr("disabled");
+		} else {
+			$('button:button[name="submitChangeRecoveryKey"]').attr("disabled", "true");
+		}
+	});
+
+
+	$('button:button[name="submitChangeRecoveryKey"]').click(function() {
+		var oldRecoveryPassword = $('input:password[id="oldRecoveryPassword"]').val();
+		var newRecoveryPassword = $('input:password[id="newRecoveryPassword"]').val();
+		OC.msg.startSaving('#encryption .msg');
+		$.post(
+		OC.filePath( 'files_encryption', 'ajax', 'changeRecoveryPassword.php' )
+			, { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword }
+			,  function( data ) {
+				if (data.status == "error") {
+					OC.msg.finishedSaving('#encryption .msg', data);
+				} else {
+					OC.msg.finishedSaving('#encryption .msg', data);
+				}
+			}
+		);
+	});
+	
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
new file mode 100644
index 0000000000000000000000000000000000000000..312b672ad464be90d5b3ef5cd466c5677141baa2
--- /dev/null
+++ b/apps/files_encryption/js/settings-personal.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+$(document).ready(function(){
+	// Trigger ajax on recoveryAdmin status change
+	$( 'input:radio[name="userEnableRecovery"]' ).change( 
+		function() {
+			
+			// Hide feedback messages in case they're already visible
+			$('#recoveryEnabledSuccess').hide();
+			$('#recoveryEnabledError').hide();
+			
+			var recoveryStatus = $( this ).val();
+			
+			$.post( 
+				OC.filePath( 'files_encryption', 'ajax', 'userrecovery.php' )
+				, { userEnableRecovery: recoveryStatus }
+				,  function( data ) {
+					if ( data.status == "success" ) {
+						$('#recoveryEnabledSuccess').show();
+					} else {
+						$('#recoveryEnabledError').show();
+					}
+				}
+			);
+			// Ensure page is not reloaded on form submit
+			return false;
+		}
+	);
+	
+	$("#encryptAll").click( 
+		function(){
+			
+			// Hide feedback messages in case they're already visible
+			$('#encryptAllSuccess').hide();
+			$('#encryptAllError').hide();
+			
+			var userPassword = $( '#userPassword' ).val();
+			var encryptAll = $( '#encryptAll' ).val();
+
+			$.post( 
+				OC.filePath( 'files_encryption', 'ajax', 'encryptall.php' )
+				, { encryptAll: encryptAll, userPassword: userPassword }
+				,  function( data ) {
+					if ( data.status == "success" ) {
+						$('#encryptAllSuccess').show();
+					} else {
+						$('#encryptAllError').show();
+					}
+				}
+			);
+			// Ensure page is not reloaded on form submit
+			return false;
+		}
+		
+	);
+});
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
deleted file mode 100644
index 0be857bb73e9dd6d35a7ad30e702d3a5c25a08a6..0000000000000000000000000000000000000000
--- a/apps/files_encryption/js/settings.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-
-$(document).ready(function(){
-	$('#encryption_blacklist').multiSelect({
-		oncheck:blackListChange,
-		onuncheck:blackListChange,
-		createText:'...'
-	});
-	
-	function blackListChange(){
-		var blackList=$('#encryption_blacklist').val().join(',');
-		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
-	}
-})
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index c8a475afd67e29cbb2392e212433572fea889101..1adc158c6b8d0bf36286c999883d76b1736ec7cb 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "التشفير",
-"File encryption is enabled." => "تشفير الملفات فعال.",
-"The following file types will not be encrypted:" => "الملفات الاتية لن يتم تشفيرها:",
-"Exclude the following file types from encryption:" => "إستثناء أنواع الملفات الاتية من التشفير: ",
-"None" => "لا شيء"
+"Saving..." => "جاري الحفظ...",
+"Encryption" => "التشفير"
 );
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 07a97f5f8a6d6a2b698297b08e5022e163b5f367..f21f7641c1a58ce1a1994dff92f7a399f60ff0e2 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Криптиране",
-"None" => "Няма"
+"Saving..." => "Записване...",
+"Encryption" => "Криптиране"
 );
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 43767d565180797d311a9b0b2400d8b00f1abfb3..068de46e7a18d45c52e24a5d98fc69e1b703629c 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "সংকেতায়ন",
-"None" => "কোনটিই নয়"
+"Saving..." => "সংরক্ষণ করা হচ্ছে..",
+"Encryption" => "সংকেতায়ন"
 );
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 0c661353a776ce7644bc8ad3e5c954e2becc28ad..46e91d1f0709f5e7ae5a0577f4402c6daf9b971c 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Encriptatge",
-"File encryption is enabled." => "L'encriptació de fitxers està activada.",
-"The following file types will not be encrypted:" => "Els tipus de fitxers següents no s'encriptaran:",
-"Exclude the following file types from encryption:" => "Exclou els tipus de fitxers següents de l'encriptatge:",
-"None" => "Cap"
+"Saving..." => "Desant...",
+"Encryption" => "Xifrat"
 );
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index d225688a079d78356a3ec1ae5eb3ef9cf4041306..f9b2dd06b6f2b989bded468b7c5b4d99dcae27c4 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Šifrování",
-"File encryption is enabled." => "Šifrování je povoleno.",
-"The following file types will not be encrypted:" => "Následující typy souborů nebudou šifrovány:",
-"Exclude the following file types from encryption:" => "Vyjmout následující typy souborů ze šifrování:",
-"None" => "Žádné"
+"Saving..." => "Ukládám...",
+"Encryption" => "Šifrování"
 );
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..6e18a7913c84afb6d279d58be1766c1e1d79e8c8
--- /dev/null
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Yn cadw...",
+"Encryption" => "Amgryptiad"
+);
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index b085381ea7b2b72f8fb66a9844c771ec9739733a..1cd43390aa3c289413c65f9e2390be265c0338dc 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Fil kryptering aktiveret.",
-"The following file types will not be encrypted:" => "De følgende filtyper vil ikke blive krypteret:",
-"Exclude the following file types from encryption:" => "Ekskluder de følgende fil typer fra kryptering:",
-"None" => "Ingen"
+"Saving..." => "Gemmer...",
+"Encryption" => "Kryptering"
 );
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index cdcd8a40b23c87ae5c13660fd17539a8885b399e..2ab77f480cfd4fa3687748e3ae07b7c3973766a3 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Verschlüsselung",
-"File encryption is enabled." => "Dateiverschlüsselung ist aktiviert",
-"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
-"Exclude the following file types from encryption:" => "Schließe die folgenden Dateitypen von der Verschlüsselung aus:",
-"None" => "Keine"
+"Saving..." => "Speichern...",
+"Encryption" => "Verschlüsselung"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 4f08b98eb29fdb50d0866b4b8ead9a1e9a468e38..884ed3c50b03d0439e5b752049b32eff721c5bed 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,7 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+"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.",
+"Saving..." => "Speichern...",
 "Encryption" => "Verschlüsselung",
-"File encryption is enabled." => "Datei-Verschlüsselung ist aktiviert",
-"The following file types will not be encrypted:" => "Die folgenden Dateitypen werden nicht verschlüsselt:",
-"Exclude the following file types from encryption:" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:",
-"None" => "Keine"
+"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.",
+"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 0031a7319445a45b376950d0e4f1f38d379a3dc4..7067799cd2e1afea357adf31f6ba1d9c559e4343 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Κρυπτογράφηση",
-"File encryption is enabled." => "Η κρυπτογράφηση αρχείων είναι ενεργή.",
-"The following file types will not be encrypted:" => "Οι παρακάτω τύποι αρχείων δεν θα κρυπτογραφηθούν:",
-"Exclude the following file types from encryption:" => "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση:",
-"None" => "Καμία"
+"Saving..." => "Γίνεται αποθήκευση...",
+"Encryption" => "Κρυπτογράφηση"
 );
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 50847062c3ba08f0923d447883ca5c83ba2515bd..ea405fda1ab7e1e219f53183c3d34977714f7b62 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Ĉifrado",
-"None" => "Nenio"
+"Saving..." => "Konservante...",
+"Encryption" => "Ĉifrado"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 4ea87b92e7c490b58b390070529ca0818bb4a367..58adbd716a839eedd84becaeac32ecdf4a3e4ab7 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,7 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se ha habilitado 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 compruebe su contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"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.",
+"Saving..." => "Guardando...",
 "Encryption" => "Cifrado",
-"File encryption is enabled." => "La encriptacion de archivo esta activada.",
-"The following file types will not be encrypted:" => "Los siguientes tipos de archivo no seran encriptados:",
-"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivo de la encriptacion:",
-"None" => "Ninguno"
+"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",
+"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 af522879e16f7d4559413c22cef8ac754ffc1b4e..857186a55fa219bbe69dcd5c9e33019e26f43326 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Encriptación",
-"File encryption is enabled." => "La encriptación de archivos no está habilitada",
-"The following file types will not be encrypted:" => "Los siguientes tipos de archivos no serán encriptados",
-"Exclude the following file types from encryption:" => "Excluir los siguientes tipos de archivos de encriptación:",
-"None" => "Ninguno"
+"Saving..." => "Guardando...",
+"Encryption" => "Encriptación"
 );
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0d189ac062ea4cbf9b42654edcd88867e38f3846..e762647f782f6d1ebec868c393af9c6f13b178c3 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,7 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
+"Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
+"Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+"Password successfully changed." => "Parool edukalt vahetatud.",
+"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",
-"File encryption is enabled." => "Faili krüpteerimine on sisse lülitatud.",
-"The following file types will not be encrypted:" => "Järgnevaid failitüüpe ei krüpteerita:",
-"Exclude the following file types from encryption:" => "Järgnevaid failitüüpe ei krüpteerita:",
-"None" => "Pole"
+"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/eu.php b/apps/files_encryption/l10n/eu.php
index 5a22b65728ef5d9d669b57dcd72559cda9830c60..253953e5c52fa215457afe828ac6147825412dea 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Enkriptazioa",
-"File encryption is enabled." => "Fitxategien enkriptazioa gaituta dago.",
-"The following file types will not be encrypted:" => "Hurrengo fitxategi motak ez dira enkriptatuko:",
-"Exclude the following file types from encryption:" => "Baztertu hurrengo fitxategi motak enkriptatzetik:",
-"None" => "Bat ere ez"
+"Saving..." => "Gordetzen...",
+"Encryption" => "Enkriptazioa"
 );
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 7acf196b791aade55985c5ec52201a482402fe1e..af2e36b2a83d9c09778dfb538d7215f1e5898512 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "رمزگذاری",
-"File encryption is enabled." => "رمزنگاری فایلها فعال شد.",
-"The following file types will not be encrypted:" => "فایلهای زیر رمزنگاری نخواهند شد:",
-"Exclude the following file types from encryption:" => "فایلهای زیر از رمزنگاری نادیده گرفته می شوند:",
-"None" => "هیچ‌کدام"
+"Saving..." => "در حال ذخیره سازی...",
+"Encryption" => "رمزگذاری"
 );
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 6352d396b3c1ae65fecc57a1ba2a689aace7863b..a00cc8ab96e09e3339f2326dc9a81e55b1501516 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
+"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+"Saving..." => "Tallennetaan...",
 "Encryption" => "Salaus",
-"File encryption is enabled." => "Tiedostojen salaus on käytössä.",
-"The following file types will not be encrypted:" => "Seuraavia tiedostotyyppejä ei salata:",
-"Exclude the following file types from encryption:" => "Älä salaa seuravia tiedostotyyppejä:",
-"None" => "Ei mitään"
+"Enabled" => "Käytössä",
+"Disabled" => "Ei käytössä",
+"Change Password" => "Vaihda salasana"
 );
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 88f1e4a393f24ad432ca05cd3e8a17dbd497ef61..98fb70691df3da3547ef4167e452c076010b4901 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Chiffrement",
-"File encryption is enabled." => "Le chiffrement des fichiers est activé",
-"The following file types will not be encrypted:" => "Les fichiers de types suivants ne seront pas chiffrés :",
-"Exclude the following file types from encryption:" => "Ne pas chiffrer les fichiers dont les types sont les suivants :",
-"None" => "Aucun"
+"Saving..." => "Enregistrement...",
+"Encryption" => "Chiffrement"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 3210f71545312e5b90b9677f90ecacd861e4d157..ca93efba9aa20d76af5003a99812f6c559dc1de5 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,7 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
+"Could not enable recovery key. Please check your recovery key password!" => "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
+"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.",
+"Saving..." => "Gardando...",
 "Encryption" => "Cifrado",
-"File encryption is enabled." => "O cifrado de ficheiros está activado",
-"The following file types will not be encrypted:" => "Os seguintes tipos de ficheiros non van seren cifrados:",
-"Exclude the following file types from encryption:" => "Excluír os seguintes tipos de ficheiros do cifrado:",
-"None" => "Ningún"
+"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",
+"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 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",
+"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/he.php b/apps/files_encryption/l10n/he.php
index cbb74bfee9a5cb5b7895a46bfac1cff99d58758f..7a80cfa2f9f07af3dca60f85539559762b72a093 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "הצפנה",
-"None" => "כלום"
+"Saving..." => "שמירה…",
+"Encryption" => "הצפנה"
 );
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b9284ddc5eaec498397034f55e74681f620a241
--- /dev/null
+++ b/apps/files_encryption/l10n/hr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Spremanje..."
+);
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 4043da108c0e0a991d2d1385f63eedb172779035..bf95c31f2c5fa61a459b58b0b882d23465c068ce 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Titkosítás",
-"File encryption is enabled." => "Az állományok titkosítása be van kapcsolva.",
-"The following file types will not be encrypted:" => "A következő fájltípusok nem kerülnek titkosításra:",
-"Exclude the following file types from encryption:" => "Zárjuk ki a titkosításból a következő fájltípusokat:",
-"None" => "Egyik sem"
+"Saving..." => "Mentés...",
+"Encryption" => "Titkosítás"
 );
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 6044348e72e335b5f813e25382185af6bfd9927f..ad827b537910c58755d2825e024f9286604ee946 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Enkripsi",
-"File encryption is enabled." => "Enkripsi berkas aktif.",
-"The following file types will not be encrypted:" => "Tipe berkas berikut tidak akan dienkripsi:",
-"Exclude the following file types from encryption:" => "Kecualikan tipe berkas berikut dari enkripsi:",
-"None" => "Tidak ada"
+"Saving..." => "Menyimpan...",
+"Encryption" => "Enkripsi"
 );
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index bd964185c4575bf57662d2a5536bcb0df8a84648..0f98c6bd3bff6c7c602358919e478ab2b6c1487a 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Dulkóðun",
-"None" => "Ekkert"
+"Saving..." => "Er að vista ...",
+"Encryption" => "Dulkóðun"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 9ab9bc492a0fb599349802711ac6ada4df5a7237..63ae4b70b443aa145b243f3761bea1e54271ecd7 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,7 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Chiave di ripristino abilitata correttamente",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
+"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
+"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.",
+"Saving..." => "Salvataggio in corso...",
 "Encryption" => "Cifratura",
-"File encryption is enabled." => "La cifratura dei file è abilitata.",
-"The following file types will not be encrypted:" => "I seguenti tipi di file non saranno cifrati:",
-"Exclude the following file types from encryption:" => "Escludi i seguenti tipi di file dalla cifratura:",
-"None" => "Nessuna"
+"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",
+"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 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",
+"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 35fba615aec29d6c6974cfd4b369655142e7be79..6d2d3e249c0b0ffc17b4e4783c41ac279a135244 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,7 +1,22 @@
 <?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" => "暗号化",
-"File encryption is enabled." => "ファイルの暗号化は有効です。",
-"The following file types will not be encrypted:" => "次のファイルタイプは暗号化されません:",
-"Exclude the following file types from encryption:" => "次のファイルタイプを暗号化から除外:",
-"None" => "なし"
+"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" => "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。",
+"File recovery settings updated" => "ファイル復旧設定が更新されました",
+"Could not update file recovery" => "ファイル復旧を更新できませんでした"
 );
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index 0362c676f00896ffeec998b4d561fd6ec189d674..55a59f44341af0c3a7a1485e2779807de11deb4e 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "ენკრიპცია",
-"File encryption is enabled." => "ფაილის ენკრიპცია ჩართულია.",
-"The following file types will not be encrypted:" => "შემდეგი ფაილური ტიპების ენკრიპცია არ მოხდება:",
-"Exclude the following file types from encryption:" => "ამოიღე შემდეგი ფაილის ტიპები ენკრიპციიდან:",
-"None" => "არა"
+"Saving..." => "შენახვა...",
+"Encryption" => "ენკრიპცია"
 );
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index bd1580578c42146002ac808db852674b847b0c6b..cf8149da3abf724b6c02b9f0b878bd1c1195aabc 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "암호화",
-"None" => "없음"
+"Saving..." => "저장 중...",
+"Encryption" => "암호화"
 );
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index 02c030014fa014b23ecefbfcb783efc2cdd2a564..61b720372ec0ac322422ae32d1e7745a11404b8d 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "نهێنیکردن",
-"None" => "هیچ"
+"Saving..." => "پاشکه‌وتده‌کات...",
+"Encryption" => "نهێنیکردن"
 );
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
new file mode 100644
index 0000000000000000000000000000000000000000..77bad681732931b2d094e3a5b1bffcea7770604b
--- /dev/null
+++ b/apps/files_encryption/l10n/lb.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Speicheren..."
+);
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 67769c8f36566ab45dbaafce7057b9f7eaee18b4..6bc80ff44ab931bed0c3882af8fed16d37f2ff06 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Å ifravimas",
-"None" => "Nieko"
+"Saving..." => "Saugoma...",
+"Encryption" => "Å ifravimas"
 );
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index fc31ccdb92d25209689358bc5e00522f3f2b1e36..04922854ceba7938a57ddd7e041f35105b7afff9 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Šifrēšana",
-"File encryption is enabled." => "Datņu šifrēšana ir aktivēta.",
-"The following file types will not be encrypted:" => "Sekojošās datnes netiks šifrētas:",
-"Exclude the following file types from encryption:" => "Sekojošos datņu tipus izslēgt no šifrēšanas:",
-"None" => "Nav"
+"Saving..." => "Saglabā...",
+"Encryption" => "Šifrēšana"
 );
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index 513606fadc3dd68e5cb2f3d603278d47abef4ab1..a7216f205adbee12a97fd0b208deeed3958e956f 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Енкрипција",
-"None" => "Ништо"
+"Saving..." => "Снимам...",
+"Encryption" => "Енкрипција"
 );
diff --git a/apps/files_encryption/l10n/ms_MY.php b/apps/files_encryption/l10n/ms_MY.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb963cb72d26e8c91fd52d77c707b6dfa3c8dc96
--- /dev/null
+++ b/apps/files_encryption/l10n/ms_MY.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Simpan..."
+);
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index a5e16a034218f70cfbd03f2b55073b9c46934166..d4e2b1ffb50a8ef55643cfd438e1a6d54a019804 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Fil-kryptering er aktivert.",
-"The following file types will not be encrypted:" => "Følgende filtyper vil ikke bli kryptert:",
-"Exclude the following file types from encryption:" => "Ekskluder følgende filtyper fra kryptering:",
-"None" => "Ingen"
+"Saving..." => "Lagrer...",
+"Encryption" => "Kryptering"
 );
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index b1cba96aad775d5d5256796ab530cf674759651f..9c462917cf3c33374d7ad6906f88fb65ec5da34c 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,7 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
+"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
+"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
+"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.",
+"Saving..." => "Opslaan",
 "Encryption" => "Versleuteling",
-"File encryption is enabled." => "Bestandsversleuteling geactiveerd.",
-"The following file types will not be encrypted:" => "De volgende bestandstypen zullen niet worden versleuteld:",
-"Exclude the following file types from encryption:" => "Sluit de volgende bestandstypen uit van versleuteling:",
-"None" => "Geen"
+"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",
+"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 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",
+"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
+"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
 );
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..97b3a27a9d0b7c772d640610beae89c6b2a16ea2
--- /dev/null
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Lagrar …"
+);
diff --git a/apps/files_encryption/l10n/oc.php b/apps/files_encryption/l10n/oc.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a34c4cda12199ca891d94bb33cc6c2b34169cab
--- /dev/null
+++ b/apps/files_encryption/l10n/oc.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Enregistra..."
+);
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 2fa86f454f9bfbc1bbf6a361e3c44bc9b9f68739..a6f90db4cd86ea74eaa47a3f736293747dbd8d6d 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,7 +1,18 @@
 <?php $TRANSLATIONS = array(
+"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.",
+"Saving..." => "Zapisywanie...",
 "Encryption" => "Szyfrowanie",
-"File encryption is enabled." => "Szyfrowanie plików jest włączone",
-"The following file types will not be encrypted:" => "Poniższe typy plików nie będą szyfrowane:",
-"Exclude the following file types from encryption:" => "Wyłącz poniższe typy plików z szyfrowania:",
-"None" => "Brak"
+"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",
+"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 28807db72ce820c067840756b9e19ef6a3cf6d2a..e5fa0b55cadae5140b0771133769456affe151e3 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,7 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
+"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.",
+"Saving..." => "Salvando...",
 "Encryption" => "Criptografia",
-"File encryption is enabled." => "A criptografia de arquivos está ativada.",
-"The following file types will not be encrypted:" => "Os seguintes tipos de arquivo não serão criptografados:",
-"Exclude the following file types from encryption:" => "Excluir os seguintes tipos de arquivo da criptografia:",
-"None" => "Nenhuma"
+"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",
+"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 Password" => "Trocar Senha",
+"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:",
+"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida",
+"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
+"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 1c46011fc10b48b628dd03826aa913e6f5e9d9a2..e1bb17ecaa7d87c7177e5fa8e8f9edd3bf64e333 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
+"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",
-"File encryption is enabled." => "A encriptação de ficheiros está ligada",
-"The following file types will not be encrypted:" => "Os seguintes ficheiros não serão encriptados:",
-"Exclude the following file types from encryption:" => "Excluir da encriptação os seguintes tipos de ficheiro:",
-"None" => "Nenhum"
+"Enabled" => "Activado",
+"Disabled" => "Desactivado",
+"Change Password" => "Mudar a Password"
 );
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index a5a6fb3cb787e2440a8993be13150190e60d8888..9e04b627c42688174e7bd239a30b06d67eae872a 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "ÃŽncriptare",
-"None" => "Niciuna"
+"Saving..." => "Se salvează...",
+"Encryption" => "ÃŽncriptare"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 22c1e3da3747c957863a007ce8bc54708eebe2cf..aaf7f0997c32d7832147bbd8a231c3393792f6a0 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,7 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Пароль изменен удачно.",
+"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
+"Saving..." => "Сохранение...",
 "Encryption" => "Шифрование",
-"File encryption is enabled." => "Шифрование файла включено.",
-"The following file types will not be encrypted:" => "Следующие типы файлов не будут зашифрованы:",
-"Exclude the following file types from encryption:" => "Исключить следующие типы файлов из шифрованных:",
-"None" => "Ничего"
+"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" => "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля",
+"File recovery settings updated" => "Настройки файла восстановления обновлены",
+"Could not update file recovery" => "Невозможно обновить файл восстановления"
 );
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 7222235485c6f50a15b797ec924ef7ab27aa2645..1351f63f89b8e87ba4b736fc449e52cabed6f1f6 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Шифрование",
-"None" => "Ни один"
+"Saving..." => "Сохранение"
 );
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index d9cec4b7220210880e57ccc4d4cef45f66f9082f..6c678bb3a4f93ba7dafa670e571d742969a2bc76 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "ගුප්ත කේතනය",
-"None" => "කිසිවක් නැත"
+"Saving..." => "සුරැකෙමින් පවතී...",
+"Encryption" => "ගුප්ත කේතනය"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index bebb6234710dc2146021ca6a95dcc86a77a658cd..279481fbd4f364a889e6339cdf0c13d47072687b 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,7 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Heslo úspešne zmenené.",
+"Saving..." => "Ukladám...",
 "Encryption" => "Å ifrovanie",
-"File encryption is enabled." => "Šifrovanie súborov nastavené.",
-"The following file types will not be encrypted:" => "Uvedené typy súborov nebudú šifrované:",
-"Exclude the following file types from encryption:" => "Nešifrovať uvedené typy súborov",
-"None" => "Žiadne"
+"Enabled" => "Povolené",
+"Disabled" => "Zakázané",
+"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
+"Change Password" => "Zmeniť 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/sl.php b/apps/files_encryption/l10n/sl.php
index 4754e21214ea5b66c4a757e59fbe23ea04fca946..a420fe161df70546ca28d4c307553d039bccca39 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Å ifriranje",
-"File encryption is enabled." => "Šifriranje datotek je omogočeno.",
-"The following file types will not be encrypted:" => "Navedene vrste datotek ne bodo Å¡ifrirane:",
-"Exclude the following file types from encryption:" => "Ne Å¡ifriraj navedenih vrst datotek:",
-"None" => "Brez"
+"Saving..." => "Poteka shranjevanje ...",
+"Encryption" => "Å ifriranje"
 );
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index 91f7fc62a90f5f43b3275b6cf17642976ec4fd9c..a36e37c1790f1e7158feb4d1c3fcdaea563058a4 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Шифровање",
-"None" => "Ништа"
+"Saving..." => "Чување у току...",
+"Encryption" => "Шифровање"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index e214a937a1d4195883b87866080a523ca50acaf1..966963b55493ef1f19259779200002767a9ecdb3 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Kryptering",
-"File encryption is enabled." => "Filkryptering är aktiverat.",
-"The following file types will not be encrypted:" => "Följande filtyper kommer inte att krypteras:",
-"Exclude the following file types from encryption:" => "Exkludera följande filtyper från kryptering:",
-"None" => "Ingen"
+"Saving..." => "Sparar...",
+"Encryption" => "Kryptering"
 );
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 152e631d0fc419a43518e6c985802568a0f90b1b..63fe9ecde86944b117bd14a603506940ddd76e6a 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "மறைக்குறியீடு",
-"None" => "ஒன்றுமில்லை"
+"Saving..." => "சேமிக்கப்படுகிறது...",
+"Encryption" => "மறைக்குறியீடு"
 );
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index e46d249118606f7f97352d974cd6054385262726..6cab4370ccf2413b2140c49bbd0fdfb4ea39edc1 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "การเข้ารหัส",
-"None" => "ไม่ต้อง"
+"Saving..." => "กำลังบันทึกข้อมูล...",
+"Encryption" => "การเข้ารหัส"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 6b42c757e6577a64371ba5d57f679eb136d17c48..917ff0a0eaebb6bc6967b67e457043f7eedd6a8b 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Åžifreleme",
-"File encryption is enabled." => "Dosya ÅŸifreleme aktif.",
-"The following file types will not be encrypted:" => "Belirtilen dosya tipleri ÅŸifrelenmeyecek:",
-"Exclude the following file types from encryption:" => "Seçilen dosya tiplerini şifreleme:",
-"None" => "Hiçbiri"
+"Saving..." => "Kaydediliyor...",
+"Encryption" => "Åžifreleme"
 );
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..954d95b4132977305ae13648d6c430b91157ac08
--- /dev/null
+++ b/apps/files_encryption/l10n/ug.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "ساقلاۋاتىدۇ…",
+"Encryption" => "شىفىرلاش"
+);
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index d495714119163fc5709491d5491a6a2795609cbb..1c176a391423e5abf4e8d6332bd7a14b0d62c7d2 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Шифрування",
-"File encryption is enabled." => "Увімкнуто шифрування файлів.",
-"The following file types will not be encrypted:" => "Такі типи файлів шифруватись не будуть:",
-"Exclude the following file types from encryption:" => "Виключити наступні типи файлів з ​​шифрування:",
-"None" => "Жоден"
+"Saving..." => "Зберігаю...",
+"Encryption" => "Шифрування"
 );
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 0a88d1b2db60b09f23e67d9ed317e9e4aa771cc7..0af5bdc9a678d886240174b835054c97c4b84d36 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Mã hóa",
-"File encryption is enabled." => "Mã hóa file đã mở",
-"The following file types will not be encrypted:" => "Loại file sau sẽ không được mã hóa",
-"Exclude the following file types from encryption:" => "Việc mã hóa không bao gồm loại file sau",
-"None" => "Không có gì hết"
+"Saving..." => "Đang lưu...",
+"Encryption" => "Mã hóa"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 12d903e6567169d0ca5970e91fb0d4631e54f73b..3c405a81ace8ddfb0ee74281b823a911faa19477 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,4 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "加密",
-"None" => "æ— "
+"Saving..." => "保存中...",
+"Encryption" => "加密"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 13fa95203e437684194ed12b40637bbb00d50c6c..e565fce801c0114169f2ebde3561cbe6b9b4800a 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,7 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "加密",
-"File encryption is enabled." => "文件加密已启用.",
-"The following file types will not be encrypted:" => "如下的文件类型将不会被加密:",
-"Exclude the following file types from encryption:" => "从加密中排除如下的文件类型:",
-"None" => "æ— "
+"Saving..." => "保存中",
+"Encryption" => "加密"
 );
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index 0c0b709fdc1f47d88eb809638ab9a75391d08884..0a38a2ddf856ddb1e460af9821642559a44d6e5d 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,6 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "加密",
-"File encryption is enabled." => "檔案加密已開啟",
-"The following file types will not be encrypted:" => "以下文件類別將不會被加密",
-"None" => "空"
+"Encryption" => "加密"
 );
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 95e61b45dc263998071b5987e32b2b7fd9e21166..faea3f54a18701df5b8476efa5c36d3908b28bbc 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,7 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "成功變更密碼。",
+"Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
+"Saving..." => "儲存中...",
 "Encryption" => "加密",
-"File encryption is enabled." => "檔案加密已被啟用",
-"The following file types will not be encrypted:" => "以下的文件類型不會被加密：",
-"Exclude the following file types from encryption:" => "從加密中排除的檔案類型：",
-"None" => "ç„¡"
+"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 437a18669e5f2e8d67bb46a9b01752b0873f896b..ddeb3590f6032c1e5822f46291f8e5e8cc247171 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,13 +25,8 @@
 
 namespace OCA\Encryption;
 
-require_once 'Crypt_Blowfish/Blowfish.php';
-
-// Todo:
-//  - Add a setting "Don´t encrypt files larger than xx because of performance"
-//  - Don't use a password directly as encryption key. but a key which is 
-//    stored on the server and encrypted with the user password. -> change pass 
-//    faster
+//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
 
 /**
  * Class for common cryptography functionality
@@ -41,10 +36,10 @@ class Crypt {
 
 	/**
 	 * @brief return encryption mode client or server side encryption
-	 * @param string user name (use system wide setting if name=null)
+	 * @param string $user name (use system wide setting if name=null)
 	 * @return string 'client' or 'server'
 	 */
-	public static function mode( $user = null ) {
+	public static function mode($user = null) {
 
 		return 'server';
 
@@ -56,30 +51,33 @@ class Crypt {
 	 */
 	public static function createKeypair() {
 
-		$res = openssl_pkey_new();
+		$res = openssl_pkey_new(array('private_key_bits' => 4096));
 
 		// Get private key
-		openssl_pkey_export( $res, $privateKey );
+		openssl_pkey_export($res, $privateKey);
 
 		// Get public key
-		$publicKey = openssl_pkey_get_details( $res );
+		$publicKey = openssl_pkey_get_details($res);
 
 		$publicKey = $publicKey['key'];
 
-		return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
+		return (array(
+			'publicKey' => $publicKey,
+			'privateKey' => $privateKey
+		));
 
 	}
 
 	/**
 	 * @brief Add arbitrary padding to encrypted data
 	 * @param string $data data to be padded
-	 * @return padded data
+	 * @return string padded data
 	 * @note In order to end up with data exactly 8192 bytes long we must
 	 * add two letters. It is impossible to achieve exactly 8192 length
 	 * blocks with encryption alone, hence padding is added to achieve the
 	 * required length.
 	 */
-	public static function addPadding( $data ) {
+	public static function addPadding($data) {
 
 		$padded = $data . 'xx';
 
@@ -90,13 +88,13 @@ class Crypt {
 	/**
 	 * @brief Remove arbitrary padding to encrypted data
 	 * @param string $padded padded data to remove padding from
-	 * @return unpadded data on success, false on error
+	 * @return string unpadded data on success, false on error
 	 */
-	public static function removePadding( $padded ) {
+	public static function removePadding($padded) {
 
-		if ( substr( $padded, -2 ) == 'xx' ) {
+		if (substr($padded, -2) === 'xx') {
 
-			$data = substr( $padded, 0, -2 );
+			$data = substr($padded, 0, -2);
 
 			return $data;
 
@@ -111,29 +109,30 @@ class Crypt {
 
 	/**
 	 * @brief Check if a file's contents contains an IV and is symmetrically encrypted
-	 * @return true / false
+	 * @param $content
+	 * @return boolean
 	 * @note see also OCA\Encryption\Util->isEncryptedPath()
 	 */
-	public static function isCatfile( $content ) {
+	public static function isCatfileContent($content) {
 
-		if ( !$content ) {
+		if (!$content) {
 
 			return false;
 
 		}
 
-		$noPadding = self::removePadding( $content );
+		$noPadding = self::removePadding($content);
 
 		// Fetch encryption metadata from end of file
-		$meta = substr( $noPadding, -22 );
+		$meta = substr($noPadding, -22);
 
 		// Fetch IV from end of file
-		$iv = substr( $meta, -16 );
+		$iv = substr($meta, -16);
 
 		// Fetch identifier from start of metadata
-		$identifier = substr( $meta, 0, 6 );
+		$identifier = substr($meta, 0, 6);
 
-		if ( $identifier == '00iv00') {
+		if ($identifier === '00iv00') {
 
 			return true;
 
@@ -150,36 +149,36 @@ class Crypt {
 	 * @param string $path
 	 * @return bool
 	 */
-	public static function isEncryptedMeta( $path ) {
+	public static function isEncryptedMeta($path) {
 
 		// TODO: Use DI to get \OC\Files\Filesystem out of here
 
 		// Fetch all file metadata from DB
-		$metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );
+		$metadata = \OC\Files\Filesystem::getFileInfo($path);
 
 		// Return encryption status
-		return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
+		return isset($metadata['encrypted']) && ( bool )$metadata['encrypted'];
 
 	}
 
 	/**
 	 * @brief Check if a file is encrypted via legacy system
+	 * @param $data
 	 * @param string $relPath The path of the file, relative to user/data;
 	 *        e.g. filename or /Docs/filename, NOT admin/files/filename
-	 * @return true / false
+	 * @return boolean
 	 */
-	public static function isLegacyEncryptedContent( $data, $relPath ) {
+	public static function isLegacyEncryptedContent($data, $relPath) {
 
 		// Fetch all file metadata from DB
-		$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
+		$metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');
 
 		// If a file is flagged with encryption in DB, but isn't a 
 		// valid content + IV combination, it's probably using the 
 		// legacy encryption system
-		if (
-			isset( $metadata['encrypted'] )
-			and $metadata['encrypted'] === true
-			and ! self::isCatfile( $data )
+		if (isset($metadata['encrypted'])
+			&& $metadata['encrypted'] === true
+			&& !self::isCatfileContent($data)
 		) {
 
 			return true;
@@ -194,17 +193,20 @@ class Crypt {
 
 	/**
 	 * @brief Symmetrically encrypt a string
-	 * @returns encrypted file
+	 * @param $plainContent
+	 * @param $iv
+	 * @param string $passphrase
+	 * @return string encrypted file content
 	 */
-	public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
+	public static function encrypt($plainContent, $iv, $passphrase = '') {
 
-		if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+		if ($encryptedContent = openssl_encrypt($plainContent, 'AES-128-CFB', $passphrase, false, $iv)) {
 
 			return $encryptedContent;
 
 		} else {
 
-			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed', \OC_Log::ERROR );
+			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of content failed', \OCP\Util::ERROR);
 
 			return false;
 
@@ -214,18 +216,21 @@ class Crypt {
 
 	/**
 	 * @brief Symmetrically decrypt a string
-	 * @returns decrypted file
+	 * @param $encryptedContent
+	 * @param $iv
+	 * @param $passphrase
+	 * @throws \Exception
+	 * @return string decrypted file content
 	 */
-	public static function decrypt( $encryptedContent, $iv, $passphrase ) {
+	public static function decrypt($encryptedContent, $iv, $passphrase) {
 
-		if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+		if ($plainContent = openssl_decrypt($encryptedContent, 'AES-128-CFB', $passphrase, false, $iv)) {
 
 			return $plainContent;
 
-
 		} else {
 
-			throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
+			throw new \Exception('Encryption library: Decryption (symmetric) of content failed');
 
 		}
 
@@ -237,7 +242,7 @@ class Crypt {
 	 * @param string $iv IV to be concatenated
 	 * @returns string concatenated content
 	 */
-	public static function concatIv ( $content, $iv ) {
+	public static function concatIv($content, $iv) {
 
 		$combined = $content . '00iv00' . $iv;
 
@@ -250,20 +255,20 @@ class Crypt {
 	 * @param string $catFile concatenated data to be split
 	 * @returns array keys: encrypted, iv
 	 */
-	public static function splitIv ( $catFile ) {
+	public static function splitIv($catFile) {
 
 		// Fetch encryption metadata from end of file
-		$meta = substr( $catFile, -22 );
+		$meta = substr($catFile, -22);
 
 		// Fetch IV from end of file
-		$iv = substr( $meta, -16 );
+		$iv = substr($meta, -16);
 
 		// Remove IV and IV identifier text to expose encrypted content
-		$encrypted = substr( $catFile, 0, -22 );
+		$encrypted = substr($catFile, 0, -22);
 
 		$split = array(
-			'encrypted' => $encrypted
-		, 'iv' => $iv
+			'encrypted' => $encrypted,
+			'iv' => $iv
 		);
 
 		return $split;
@@ -272,14 +277,16 @@ class Crypt {
 
 	/**
 	 * @brief Symmetrically encrypts a string and returns keyfile content
-	 * @param $plainContent content to be encrypted in keyfile
-	 * @returns encrypted content combined with IV
+	 * @param string $plainContent content to be encrypted in keyfile
+	 * @param string $passphrase
+	 * @return bool|string
+	 * @return string encrypted content combined with IV
 	 * @note IV need not be specified, as it will be stored in the returned keyfile
 	 * and remain accessible therein.
 	 */
-	public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
+	public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {
 
-		if ( !$plainContent ) {
+		if (!$plainContent) {
 
 			return false;
 
@@ -287,18 +294,18 @@ class Crypt {
 
 		$iv = self::generateIv();
 
-		if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
+		if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
 
 			// Combine content to encrypt with IV identifier and actual IV
-			$catfile = self::concatIv( $encryptedContent, $iv );
+			$catfile = self::concatIv($encryptedContent, $iv);
 
-			$padded = self::addPadding( $catfile );
+			$padded = self::addPadding($catfile);
 
 			return $padded;
 
 		} else {
 
-			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed', \OC_Log::ERROR );
+			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);
 
 			return false;
 
@@ -309,31 +316,37 @@ class Crypt {
 
 	/**
 	 * @brief Symmetrically decrypts keyfile content
-	 * @param string $source
-	 * @param string $target
-	 * @param string $key the decryption key
-	 * @returns decrypted content
+	 * @param $keyfileContent
+	 * @param string $passphrase
+	 * @throws \Exception
+	 * @return bool|string
+	 * @internal param string $source
+	 * @internal param string $target
+	 * @internal param string $key the decryption key
+	 * @returns string decrypted content
 	 *
 	 * This function decrypts a file
 	 */
-	public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
+	public static function symmetricDecryptFileContent($keyfileContent, $passphrase = '') {
 
-		if ( !$keyfileContent ) {
+		if (!$keyfileContent) {
 
-			throw new \Exception( 'Encryption library: no data provided for decryption' );
+			throw new \Exception('Encryption library: no data provided for decryption');
 
 		}
 
 		// Remove padding
-		$noPadding = self::removePadding( $keyfileContent );
+		$noPadding = self::removePadding($keyfileContent);
 
 		// Split into enc data and catfile
-		$catfile = self::splitIv( $noPadding );
+		$catfile = self::splitIv($noPadding);
 
-		if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
+		if ($plainContent = self::decrypt($catfile['encrypted'], $catfile['iv'], $passphrase)) {
 
 			return $plainContent;
 
+		} else {
+			return false;
 		}
 
 	}
@@ -346,15 +359,15 @@ class Crypt {
 	 *
 	 * This function decrypts a file
 	 */
-	public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
+	public static function symmetricEncryptFileContentKeyfile($plainContent) {
 
 		$key = self::generateKey();
 
-		if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
+		if ($encryptedContent = self::symmetricEncryptFileContent($plainContent, $key)) {
 
 			return array(
-				'key' => $key
-			, 'encrypted' => $encryptedContent
+				'key' => $key,
+				'encrypted' => $encryptedContent
 			);
 
 		} else {
@@ -368,22 +381,41 @@ class Crypt {
 	/**
 	 * @brief Create asymmetrically encrypted keyfile content using a generated key
 	 * @param string $plainContent content to be encrypted
-	 * @returns array keys: key, encrypted
-	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
-	 *
-	 * This function decrypts a file
+	 * @param array $publicKeys array keys must be the userId of corresponding user
+	 * @returns array keys: keys (array, key = userId), data
+	 * @note symmetricDecryptFileContent() can decrypt files created using this method
 	 */
-	public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
+	public static function multiKeyEncrypt($plainContent, array $publicKeys) {
+
+		// openssl_seal returns false without errors if $plainContent 
+		// is empty, so trigger our own error
+		if (empty($plainContent)) {
+
+			throw new \Exception('Cannot mutliKeyEncrypt empty plain content');
+
+		}
 
 		// Set empty vars to be set by openssl by reference
 		$sealed = '';
-		$envKeys = array();
+		$shareKeys = array();
+		$mappedShareKeys = array();
 
-		if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
+		if (openssl_seal($plainContent, $sealed, $shareKeys, $publicKeys)) {
+
+			$i = 0;
+
+			// Ensure each shareKey is labelled with its 
+			// corresponding userId
+			foreach ($publicKeys as $userId => $publicKey) {
+
+				$mappedShareKeys[$userId] = $shareKeys[$i];
+				$i++;
+
+			}
 
 			return array(
-				'keys' => $envKeys
-			, 'encrypted' => $sealed
+				'keys' => $mappedShareKeys,
+				'data' => $sealed
 			);
 
 		} else {
@@ -396,27 +428,31 @@ class Crypt {
 
 	/**
 	 * @brief Asymmetrically encrypt a file using multiple public keys
-	 * @param string $plainContent content to be encrypted
+	 * @param $encryptedContent
+	 * @param $shareKey
+	 * @param $privateKey
+	 * @return bool
+	 * @internal param string $plainContent content to be encrypted
 	 * @returns string $plainContent decrypted string
 	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
 	 *
 	 * This function decrypts a file
 	 */
-	public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+	public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey) {
 
-		if ( !$encryptedContent ) {
+		if (!$encryptedContent) {
 
 			return false;
 
 		}
 
-		if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+		if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {
 
 			return $plainContent;
 
 		} else {
 
-			\OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed', \OC_Log::ERROR );
+			\OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OCP\Util::ERROR);
 
 			return false;
 
@@ -425,12 +461,14 @@ class Crypt {
 	}
 
 	/**
-	 * @brief Asymmetrically encrypt a string using a public key
-	 * @returns encrypted file
+	 * @brief Asymetrically encrypt a string using a public key
+	 * @param $plainContent
+	 * @param $publicKey
+	 * @return string encrypted file
 	 */
-	public static function keyEncrypt( $plainContent, $publicKey ) {
+	public static function keyEncrypt($plainContent, $publicKey) {
 
-		openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+		openssl_public_encrypt($plainContent, $encryptedContent, $publicKey);
 
 		return $encryptedContent;
 
@@ -438,110 +476,19 @@ class Crypt {
 
 	/**
 	 * @brief Asymetrically decrypt a file using a private key
-	 * @returns decrypted file
-	 */
-	public static function keyDecrypt( $encryptedContent, $privatekey ) {
-
-		openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
-
-		return $plainContent;
-
-	}
-
-	/**
-	 * @brief Encrypts content symmetrically and generates keyfile asymmetrically
-	 * @returns array containing catfile and new keyfile.
-	 * keys: data, key
-	 * @note this method is a wrapper for combining other crypt class methods
-	 */
-	public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
-
-		// Encrypt plain data, generate keyfile & encrypted file
-		$cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
-
-		// Encrypt keyfile
-		$cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
-
-		return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
-
-	}
-
-	/**
-	 * @brief Takes catfile, keyfile, and private key, and
-	 * performs decryption
-	 * @returns decrypted content
-	 * @note this method is a wrapper for combining other crypt class methods
-	 */
-	public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
-
-		// Decrypt the keyfile with the user's private key
-		$decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
-
-		// Decrypt the catfile symmetrically using the decrypted keyfile
-		$decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
-
-		return $decryptedData;
-
-	}
-
-	/**
-	 * @brief Symmetrically encrypt a file by combining encrypted component data blocks
-	 */
-	public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
-
-		$crypted = '';
-
-		$remaining = $plainContent;
-
-		$testarray = array();
-
-		while( strlen( $remaining ) ) {
-
-			//echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
-
-			// Encrypt a chunk of unencrypted data and add it to the rest
-			$block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
-
-			$padded = self::addPadding( $block );
-
-			$crypted .= $block;
-
-			$testarray[] = $block;
-
-			// Remove the data already encrypted from remaining unencrypted data
-			$remaining = substr( $remaining, 6126 );
-
-		}
-
-		return $crypted;
-
-	}
-
-
-	/**
-	 * @brief Symmetrically decrypt a file by combining encrypted component data blocks
+	 * @param $encryptedContent
+	 * @param $privatekey
+	 * @return string decrypted file
 	 */
-	public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
-
-		$decrypted = '';
-
-		$remaining = $crypted;
-
-		$testarray = array();
-
-		while( strlen( $remaining ) ) {
-
-			$testarray[] = substr( $remaining, 0, 8192 );
-
-			// Decrypt a chunk of unencrypted data and add it to the rest
-			$decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
+	public static function keyDecrypt($encryptedContent, $privatekey) {
 
-			// Remove the data already encrypted from remaining unencrypted data
-			$remaining = substr( $remaining, 8192 );
+		$result = @openssl_private_decrypt($encryptedContent, $plainContent, $privatekey);
 
+		if ($result) {
+			return $plainContent;
 		}
 
-		return $decrypted;
+		return $result;
 
 	}
 
@@ -551,24 +498,24 @@ class Crypt {
 	 */
 	public static function generateIv() {
 
-		if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
+		if ($random = openssl_random_pseudo_bytes(12, $strong)) {
 
-			if ( !$strong ) {
+			if (!$strong) {
 
 				// If OpenSSL indicates randomness is insecure, log error
-				\OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OC_Log::WARN );
+				\OCP\Util::writeLog('Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()', \OCP\Util::WARN);
 
 			}
 
 			// We encode the iv purely for string manipulation 
 			// purposes - it gets decoded before use
-			$iv = base64_encode( $random );
+			$iv = base64_encode($random);
 
 			return $iv;
 
 		} else {
 
-			throw new \Exception( 'Generating IV failed' );
+			throw new \Exception('Generating IV failed');
 
 		}
 
@@ -581,12 +528,12 @@ class Crypt {
 	public static function generateKey() {
 
 		// Generate key
-		if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
+		if ($key = base64_encode(openssl_random_pseudo_bytes(183, $strong))) {
 
-			if ( !$strong ) {
+			if (!$strong) {
 
 				// If OpenSSL indicates randomness is insecure, log error
-				throw new \Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
+				throw new \Exception('Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()');
 
 			}
 
@@ -603,15 +550,15 @@ class Crypt {
 	/**
 	 * @brief Get the blowfish encryption handeler for a key
 	 * @param $key string (optional)
-	 * @return Crypt_Blowfish blowfish object
+	 * @return \Crypt_Blowfish blowfish object
 	 *
 	 * if the key is left out, the default handeler will be used
 	 */
-	public static function getBlowfish( $key = '' ) {
+	public static function getBlowfish($key = '') {
 
-		if ( $key ) {
+		if ($key) {
 
-			return new \Crypt_Blowfish( $key );
+			return new \Crypt_Blowfish($key);
 
 		} else {
 
@@ -621,13 +568,17 @@ class Crypt {
 
 	}
 
-	public static function legacyCreateKey( $passphrase ) {
+	/**
+	 * @param $passphrase
+	 * @return mixed
+	 */
+	public static function legacyCreateKey($passphrase) {
 
 		// Generate a random integer
-		$key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
+		$key = mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999) . mt_rand(10000, 99999);
 
 		// Encrypt the key with the passphrase
-		$legacyEncKey = self::legacyEncrypt( $key, $passphrase );
+		$legacyEncKey = self::legacyEncrypt($key, $passphrase);
 
 		return $legacyEncKey;
 
@@ -635,61 +586,79 @@ class Crypt {
 
 	/**
 	 * @brief encrypts content using legacy blowfish system
-	 * @param $content the cleartext message you want to encrypt
-	 * @param $key the encryption key (optional)
-	 * @returns encrypted content
+	 * @param string $content the cleartext message you want to encrypt
+	 * @param string $passphrase
+	 * @returns string encrypted content
 	 *
 	 * This function encrypts an content
 	 */
-	public static function legacyEncrypt( $content, $passphrase = '' ) {
+	public static function legacyEncrypt($content, $passphrase = '') {
 
-		$bf = self::getBlowfish( $passphrase );
+		$bf = self::getBlowfish($passphrase);
 
-		return $bf->encrypt( $content );
+		return $bf->encrypt($content);
 
 	}
 
 	/**
 	 * @brief decrypts content using legacy blowfish system
-	 * @param $content the cleartext message you want to decrypt
-	 * @param $key the encryption key (optional)
-	 * @returns cleartext content
+	 * @param string $content the cleartext message you want to decrypt
+	 * @param string $passphrase
+	 * @return string cleartext content
 	 *
 	 * This function decrypts an content
 	 */
-	public static function legacyDecrypt( $content, $passphrase = '' ) {
-
-		$bf = self::getBlowfish( $passphrase );
-
-		$decrypted = $bf->decrypt( $content );
+	private static function legacyDecrypt($content, $passphrase = '') {
 
-		$trimmed = rtrim( $decrypted, "\0" );
+		$bf = self::getBlowfish($passphrase);
 
-		return $trimmed;
+		$decrypted = $bf->decrypt($content);
 
+		return $decrypted;
 	}
 
-	public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
-
-		$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
-
-		$recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
-
-		return $recrypted;
+	/**
+	 * @param $data
+	 * @param string $key
+	 * @param int $maxLength
+	 * @return string
+	 */
+	public static function legacyBlockDecrypt($data, $key = '', $maxLength = 0) {
 
+		$result = '';
+		while (strlen($data)) {
+			$result .= self::legacyDecrypt(substr($data, 0, 8192), $key);
+			$data = substr($data, 8192);
+		}
+		if ($maxLength > 0) {
+			return substr($result, 0, $maxLength);
+		} else {
+			return rtrim($result, "\0");
+		}
 	}
 
 	/**
-	 * @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
-	 * @param $legacyContent the legacy encrypted content to re-encrypt
-	 * @returns cleartext content
-	 *
-	 * This function decrypts an content
+	 * @param $legacyEncryptedContent
+	 * @param $legacyPassphrase
+	 * @param $publicKeys
+	 * @return array
 	 */
-	public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
+	public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys) {
 
-		// TODO: write me
+		$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
new file mode 100755
index 0000000000000000000000000000000000000000..e078ab35541154fee450f6840dde17ba607e4e93
--- /dev/null
+++ b/apps/files_encryption/lib/helper.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class to manage registration of hooks an various helper methods
+ * @package OCA\Encryption
+ */
+class Helper {
+
+	/**
+	 * @brief register share related hooks
+	 *
+	 */
+	public static function registerShareHooks() {
+
+		\OCP\Util::connectHook('OCP\Share', 'pre_shared', 'OCA\Encryption\Hooks', 'preShared');
+		\OCP\Util::connectHook('OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared');
+		\OCP\Util::connectHook('OCP\Share', 'post_unshare', 'OCA\Encryption\Hooks', 'postUnshare');
+	}
+
+	/**
+	 * @brief register user related hooks
+	 *
+	 */
+	public static function registerUserHooks() {
+
+		\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', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
+		\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
+	}
+
+	/**
+	 * @brief register filesystem related hooks
+	 *
+	 */
+	public static function registerFilesystemHooks() {
+
+		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Encryption\Hooks', 'postRename');
+	}
+
+	/**
+	 * @brief setup user for files_encryption
+	 *
+	 * @param Util $util
+	 * @param string $password
+	 * @return bool
+	 */
+	public static function setupUser($util, $password) {
+		// Check files_encryption infrastructure is ready for action
+		if (!$util->ready()) {
+
+			\OCP\Util::writeLog('Encryption library', 'User account "' . $util->getUserId()
+												 . '" is not ready for encryption; configuration started', \OCP\Util::DEBUG);
+
+			if (!$util->setupServerSide($password)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @brief enable recovery
+	 *
+	 * @param $recoveryKeyId
+	 * @param $recoveryPassword
+	 * @internal param \OCA\Encryption\Util $util
+	 * @internal param string $password
+	 * @return bool
+	 */
+	public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
+		$view = new \OC\Files\View('/');
+
+		if ($recoveryKeyId === null) {
+			$recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8);
+			\OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
+		}
+
+		if (!$view->is_dir('/owncloud_private_key')) {
+			$view->mkdir('/owncloud_private_key');
+		}
+
+		if (
+			(!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
+			 || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
+		) {
+
+			$keypair = \OCA\Encryption\Crypt::createKeypair();
+
+			\OC_FileProxy::$enabled = false;
+
+			// Save public key
+
+			if (!$view->is_dir('/public-keys')) {
+				$view->mkdir('/public-keys');
+			}
+
+			$view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
+
+			// Encrypt private key empthy passphrase
+			$encryptedPrivateKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword);
+
+			// 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
+			\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+
+			$return = true;
+
+		} else { // get recovery key and check the password
+			$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+			$return = $util->checkRecoveryPassword($recoveryPassword);
+			if ($return) {
+				\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1);
+			}
+		}
+
+		return $return;
+	}
+
+
+	/**
+	 * @brief disable recovery
+	 *
+	 * @param $recoveryPassword
+	 * @return bool
+	 */
+	public static function adminDisableRecovery($recoveryPassword) {
+		$util = new Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
+		$return = $util->checkRecoveryPassword($recoveryPassword);
+
+		if ($return) {
+			// Set recoveryAdmin as disabled
+			\OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0);
+		}
+
+		return $return;
+	}
+
+
+	/**
+	 * @brief checks if access is public/anonymous user
+	 * @return bool
+	 */
+	public static function isPublicAccess() {
+		if (\OCP\USER::getUser() === false
+			|| (isset($_GET['service']) && $_GET['service'] == 'files'
+				&& isset($_GET['t']))
+		) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @brief Format a path to be relative to the /user/files/ directory
+	 * @param string $path the absolute path
+	 * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
+	 */
+	public static function stripUserFilesPath($path) {
+		$trimmed = ltrim($path, '/');
+		$split = explode('/', $trimmed);
+		$sliced = array_slice($split, 2);
+		$relPath = implode('/', $sliced);
+
+		return $relPath;
+	}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 955877971540bf86144ec6048ec47742cefff752..e911c1785df5f74c89eecc8abd679b4e8b5f0bcb 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -28,19 +28,26 @@ namespace OCA\Encryption;
  * @note Where a method requires a view object, it's root must be '/'
  */
 class Keymanager {
-		
+
 	/**
 	 * @brief retrieve the ENCRYPTED private key from a user
-	 * 
-	 * @return string private key or false
+	 *
+	 * @param \OC_FilesystemView $view
+	 * @param string $user
+	 * @return string private key or false (hopefully)
 	 * @note the key returned by this method must be decrypted before use
 	 */
-	public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
-	
-		$path =  '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
-		
-		$key = $view->file_get_contents( $path );
-		
+	public static function getPrivateKey(\OC_FilesystemView $view, $user) {
+
+		$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$key = $view->file_get_contents($path);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
 		return $key;
 	}
 
@@ -50,102 +57,152 @@ class Keymanager {
 	 * @param $userId
 	 * @return string public key or false
 	 */
-	public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
-		
-		return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
-		
+	public static function getPublicKey(\OC_FilesystemView $view, $userId) {
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
+
 	}
-	
+
 	/**
-	 * @brief retrieve both keys from a user (private and public)
+	 * @brief Retrieve a user's public and private key
 	 * @param \OC_FilesystemView $view
 	 * @param $userId
 	 * @return array keys: privateKey, publicKey
 	 */
-	public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
-	
+	public static function getUserKeys(\OC_FilesystemView $view, $userId) {
+
 		return array(
-			'publicKey' => self::getPublicKey( $view, $userId )
-			, 'privateKey' => self::getPrivateKey( $view, $userId )
+			'publicKey' => self::getPublicKey($view, $userId),
+			'privateKey' => self::getPrivateKey($view, $userId)
 		);
-	
+
 	}
-	
+
 	/**
-	 * @brief Retrieve public keys of all users with access to a file
-	 * @param string $path Path to file
-	 * @return array of public keys for the given file
-	 * @note Checks that the sharing app is enabled should be performed 
-	 * by client code, that isn't checked here
+	 * @brief Retrieve public keys for given users
+	 * @param \OC_FilesystemView $view
+	 * @param array $userIds
+	 * @return array of public keys for the specified users
 	 */
-	public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
-		
-		$path = ltrim( $path, '/' );
-		
-		$filepath = '/' . $userId . '/files/' . $filePath;
-		
-		// Check if sharing is enabled
-		if ( OC_App::isEnabled( 'files_sharing' ) ) {
-			
-
-		
-		} else {
-		
-			// check if it is a file owned by the user and not shared at all
-			$userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
-			
-			if ( $userview->file_exists( $path ) ) {
-			
-				$users[] = $userId;
-				
-			}
-			
-		}
-		
-		$view = new \OC_FilesystemView( '/public-keys/' );
-		
-		$keylist = array();
-		
-		$count = 0;
-		
-		foreach ( $users as $user ) {
-		
-			$keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
-			
+	public static function getPublicKeys(\OC_FilesystemView $view, array $userIds) {
+
+		$keys = array();
+
+		foreach ($userIds as $userId) {
+
+			$keys[$userId] = self::getPublicKey($view, $userId);
+
 		}
-		
-		return $keylist;
-		
+
+		return $keys;
+
 	}
-	
+
 	/**
 	 * @brief store file encryption key
 	 *
+	 * @param \OC_FilesystemView $view
 	 * @param string $path relative path of the file, including filename
-	 * @param string $key
+	 * @param $userId
+	 * @param $catfile
+	 * @internal param string $key
 	 * @return bool true/false
-	 * @note The keyfile is not encrypted here. Client code must 
+	 * @note The keyfile is not encrypted here. Client code must
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
-	public static function setFileKey( \OC_FilesystemView $view, $path, $userId, $catfile ) {
-		
-		$basePath = '/' . $userId . '/files_encryption/keyfiles';
-		
-		$targetPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-		
-		if ( $view->is_dir( $basePath . '/' . $targetPath ) ) {
-		
-			
-		
+	public static function setFileKey(\OC_FilesystemView $view, $path, $userId, $catfile) {
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		//here we need the currently logged in user, while userId can be a different user
+		$util = new Util($view, \OCP\User::getUser());
+		list($owner, $filename) = $util->getUidAndFilename($path);
+
+		$basePath = '/' . $owner . '/files_encryption/keyfiles';
+
+		$targetPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+
+		if (!$view->is_dir($basePath . '/' . $targetPath)) {
+
+			// create all parent folders
+			$info = pathinfo($basePath . '/' . $targetPath);
+			$keyfileFolderName = $view->getLocalFolder($info['dirname']);
+
+			if (!file_exists($keyfileFolderName)) {
+
+				mkdir($keyfileFolderName, 0750, true);
+
+			}
+		}
+
+		// try reusing key file if part file
+		if (self::isPartialFilePath($targetPath)) {
+
+			$result = $view->file_put_contents(
+				$basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile);
+
 		} else {
 
-			// Save the keyfile in parallel directory
-			return $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-		
+			$result = $view->file_put_contents($basePath . '/' . $targetPath . '.key', $catfile);
+
 		}
-		
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
+
 	}
-	
+
+	/**
+	 * @brief Remove .path extension from a file path
+	 * @param string $path Path that may identify a .part file
+	 * @return string File path without .part extension
+	 * @note this is needed for reusing keys
+	 */
+	public static function fixPartialFilePath($path) {
+
+		if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
+
+			$newLength = strlen($path) - 5;
+			$fPath = substr($path, 0, $newLength);
+
+			return $fPath;
+
+		} else {
+
+			return $path;
+
+		}
+
+	}
+
+	/**
+	 * @brief Check if a path is a .part file
+	 * @param string $path Path that may identify a .part file
+	 * @return bool
+	 */
+	public static function isPartialFilePath($path) {
+
+		if (preg_match('/\.part$/', $path) || preg_match('/\.etmp$/', $path)) {
+
+			return true;
+
+		} else {
+
+			return false;
+
+		}
+
+	}
+
 	/**
 	 * @brief retrieve keyfile for an encrypted file
 	 * @param \OC_FilesystemView $view
@@ -156,168 +213,359 @@ class Keymanager {
 	 * @note The keyfile returned is asymmetrically encrypted. Decryption
 	 * of the keyfile must be performed by client code
 	 */
-	public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
-		
-		$filePath_f = ltrim( $filePath, '/' );
-		
-		$catfilePath = '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key';
-		
-		if ( $view->file_exists( $catfilePath ) ) {
-
-			return $view->file_get_contents( $catfilePath );
-			
+	public static function getFileKey(\OC_FilesystemView $view, $userId, $filePath) {
+
+		// try reusing key file if part file
+		if (self::isPartialFilePath($filePath)) {
+
+			$result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
+
+			if ($result) {
+
+				return $result;
+
+			}
+
+		}
+
+		$util = new Util($view, \OCP\User::getUser());
+
+		list($owner, $filename) = $util->getUidAndFilename($filePath);
+		$filePath_f = ltrim($filename, '/');
+
+		$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		if ($view->file_exists($keyfilePath)) {
+
+			$result = $view->file_get_contents($keyfilePath);
+
 		} else {
-		
-			return false;
-			
+
+			$result = false;
+
 		}
-		
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
+
 	}
-	
+
 	/**
 	 * @brief Delete a keyfile
 	 *
-	 * @param OC_FilesystemView $view
+	 * @param \OC_FilesystemView $view
 	 * @param string $userId username
 	 * @param string $path path of the file the key belongs to
 	 * @return bool Outcome of unlink operation
 	 * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
 	 *       /data/admin/files/mydoc.txt
 	 */
-	public static function deleteFileKey( \OC_FilesystemView $view, $userId, $path ) {
-		
-		$trimmed = ltrim( $path, '/' );
-		$keyPath =  '/' . $userId . '/files_encryption/keyfiles/' . $trimmed . '.key';
-		
-		// Unlink doesn't tell us if file was deleted (not found returns
-		// true), so we perform our own test
-		if ( $view->file_exists( $keyPath ) ) {
-		
-			return $view->unlink( $keyPath );
-			
+	public static function deleteFileKey(\OC_FilesystemView $view, $userId, $path) {
+
+		$trimmed = ltrim($path, '/');
+		$keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+
+		$result = false;
+
+		if ($view->is_dir($keyPath)) {
+
+			$result = $view->unlink($keyPath);
+
 		} else {
-			
-			\OC_Log::write( 'Encryption library', 'Could not delete keyfile; does not exist: "' . $keyPath, \OC_Log::ERROR );
-			
-			return false;
-			
+			if ($view->file_exists($keyPath . '.key')) {
+
+				$result = $view->unlink($keyPath . '.key');
+
+			}
+		}
+
+		if (!$result) {
+
+			\OCP\Util::writeLog('Encryption library',
+				'Could not delete keyfile; does not exist: "' . $keyPath, \OCP\Util::ERROR);
+
 		}
-		
+
+		return $result;
+
 	}
-	
+
 	/**
 	 * @brief store private key from the user
-	 * @param string key
+	 * @param string $key
 	 * @return bool
 	 * @note Encryption of the private key must be performed by client code
 	 * as no encryption takes place here
 	 */
-	public static function setPrivateKey( $key ) {
-		
+	public static function setPrivateKey($key) {
+
 		$user = \OCP\User::getUser();
-		
-		$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
-		
+
+		$view = new \OC_FilesystemView('/' . $user . '/files_encryption');
+
+		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		
-		if ( !$view->file_exists( '' ) )
-			$view->mkdir( '' );
-		
-		return $view->file_put_contents( $user . '.private.key', $key );
+
+		if (!$view->file_exists(''))
+			$view->mkdir('');
+
+		$result = $view->file_put_contents($user . '.private.key', $key);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
 
 	}
-	
+
 	/**
-	 * @brief store private keys from the user
+	 * @brief store share key
 	 *
-	 * @param string privatekey
-	 * @param string publickey
+	 * @param \OC_FilesystemView $view
+	 * @param string $path relative path of the file, including filename
+	 * @param $userId
+	 * @param $shareKey
+	 * @internal param string $key
+	 * @internal param string $dbClassName
 	 * @return bool true/false
+	 * @note The keyfile is not encrypted here. Client code must
+	 * asymmetrically encrypt the keyfile before passing it to this method
+	 */
+	public static function setShareKey(\OC_FilesystemView $view, $path, $userId, $shareKey) {
+
+		// Here we need the currently logged in user, while userId can be a different user
+		$util = new Util($view, \OCP\User::getUser());
+
+		list($owner, $filename) = $util->getUidAndFilename($path);
+
+		$basePath = '/' . $owner . '/files_encryption/share-keys';
+
+		$shareKeyPath = self::keySetPreparation($view, $filename, $basePath, $owner);
+
+		// try reusing key file if part file
+		if (self::isPartialFilePath($shareKeyPath)) {
+
+			$writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+
+		} else {
+
+			$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+
+		}
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$result = $view->file_put_contents($writePath, $shareKey);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		if (
+			is_int($result)
+			&& $result > 0
+		) {
+
+			return true;
+
+		} else {
+
+			return false;
+
+		}
+
+	}
+
+	/**
+	 * @brief store multiple share keys for a single file
+	 * @param \OC_FilesystemView $view
+	 * @param $path
+	 * @param array $shareKeys
+	 * @return bool
 	 */
-	public static function setUserKeys($privatekey, $publickey) {
-	
-		return ( self::setPrivateKey( $privatekey ) && self::setPublicKey( $publickey ) );
-	
+	public static function setShareKeys(\OC_FilesystemView $view, $path, array $shareKeys) {
+
+		// $shareKeys must be  an array with the following format:
+		// [userId] => [encrypted key]
+
+		$result = true;
+
+		foreach ($shareKeys as $userId => $shareKey) {
+
+			if (!self::setShareKey($view, $path, $userId, $shareKey)) {
+
+				// If any of the keys are not set, flag false
+				$result = false;
+
+			}
+
+		}
+
+		// Returns false if any of the keys weren't set
+		return $result;
+
 	}
-	
+
 	/**
-	 * @brief store public key of the user
-	 *
-	 * @param string key
-	 * @return bool true/false
+	 * @brief retrieve shareKey for an encrypted file
+	 * @param \OC_FilesystemView $view
+	 * @param string $userId
+	 * @param string $filePath
+	 * @internal param \OCA\Encryption\file $string name
+	 * @return string file key or false
+	 * @note The sharekey returned is encrypted. Decryption
+	 * of the keyfile must be performed by client code
 	 */
-	public static function setPublicKey( $key ) {
-		
-		$view = new \OC_FilesystemView( '/public-keys' );
-		
+	public static function getShareKey(\OC_FilesystemView $view, $userId, $filePath) {
+
+		// try reusing key file if part file
+		if (self::isPartialFilePath($filePath)) {
+
+			$result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
+
+			if ($result) {
+
+				return $result;
+
+			}
+
+		}
+
+		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		
-		if ( !$view->file_exists( '' ) )
-			$view->mkdir( '' );
-		
-		return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
 
-		
+		//here we need the currently logged in user, while userId can be a different user
+		$util = new Util($view, \OCP\User::getUser());
+
+		list($owner, $filename) = $util->getUidAndFilename($filePath);
+		$shareKeyPath = \OC\Files\Filesystem::normalizePath(
+			'/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey');
+
+		if ($view->file_exists($shareKeyPath)) {
+
+			$result = $view->file_get_contents($shareKeyPath);
+
+		} else {
+
+			$result = false;
+
+		}
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
+
 	}
-	
+
 	/**
-	 * @brief store file encryption key
+	 * @brief delete all share keys of a given file
+	 * @param \OC_FilesystemView $view
+	 * @param string $userId owner of the file
+	 * @param string $filePath path to the file, relative to the owners file dir
+	 */
+	public static function delAllShareKeys(\OC_FilesystemView $view, $userId, $filePath) {
+
+		if ($view->is_dir($userId . '/files/' . $filePath)) {
+			$view->unlink($userId . '/files_encryption/share-keys/' . $filePath);
+		} else {
+			$localKeyPath = $view->getLocalFile($userId . '/files_encryption/share-keys/' . $filePath);
+			$matches = glob(preg_quote($localKeyPath) . '*.shareKey');
+			foreach ($matches as $ma) {
+				$result = unlink($ma);
+				if (!$result) {
+					\OCP\Util::writeLog('Encryption library',
+						'Keyfile or shareKey could not be deleted for file "' . $filePath . '"', \OCP\Util::ERROR);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @brief Delete a single user's shareKey for a single file
+	 */
+	public static function delShareKey(\OC_FilesystemView $view, $userIds, $filePath) {
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		//here we need the currently logged in user, while userId can be a different user
+		$util = new Util($view, \OCP\User::getUser());
+
+		list($owner, $filename) = $util->getUidAndFilename($filePath);
+
+		$shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+
+		if ($view->is_dir($shareKeyPath)) {
+
+			$localPath = \OC\Files\Filesystem::normalizePath($view->getLocalFolder($shareKeyPath));
+			self::recursiveDelShareKeys($localPath, $userIds);
+
+		} else {
+
+			foreach ($userIds as $userId) {
+
+				if (!$view->unlink($shareKeyPath . '.' . $userId . '.shareKey')) {
+					\OCP\Util::writeLog('Encryption library',
+						'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId
+						. '.shareKey"', \OCP\Util::ERROR);
+				}
+
+			}
+		}
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+	}
+
+	/**
+	 * @brief recursively delete share keys from given users
 	 *
-	 * @param string $path relative path of the file, including filename
-	 * @param string $key
-	 * @param null $view
-	 * @param string $dbClassName
-	 * @return bool true/false
-	 * @note The keyfile is not encrypted here. Client code must
-	 * asymmetrically encrypt the keyfile before passing it to this method
+	 * @param string $dir directory
+	 * @param array $userIds user ids for which the share keys should be deleted
 	 */
-	public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
-		
-		$basePath = '/' . $userId . '/files_encryption/share-keys';
-		
-		$shareKeyPath = self::keySetPreparation( $view, $path, $basePath, $userId );
-		
-		return $view->file_put_contents( $basePath . '/' . $shareKeyPath . '.shareKey', $shareKey );
-		
+	private static function recursiveDelShareKeys($dir, $userIds) {
+		foreach ($userIds as $userId) {
+			$matches = glob(preg_quote($dir) . '/*' . preg_quote('.' . $userId . '.shareKey'));
+		}
+		/** @var $matches array */
+		foreach ($matches as $ma) {
+			if (!unlink($ma)) {
+				\OCP\Util::writeLog('Encryption library',
+					'Could not delete shareKey; does not exist: "' . $ma . '"', \OCP\Util::ERROR);
+			}
+		}
+		$subdirs = $directories = glob(preg_quote($dir) . '/*', GLOB_ONLYDIR);
+		foreach ($subdirs as $subdir) {
+			self::recursiveDelShareKeys($subdir, $userIds);
+		}
 	}
-	
+
 	/**
 	 * @brief Make preparations to vars and filesystem for saving a keyfile
 	 */
-	public static function keySetPreparation( \OC_FilesystemView $view, $path, $basePath, $userId ) {
-		
-		$targetPath = ltrim( $path, '/' );
-		
-		$path_parts = pathinfo( $targetPath );
-		
+	public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) {
+
+		$targetPath = ltrim($path, '/');
+
+		$path_parts = pathinfo($targetPath);
+
 		// If the file resides within a subdirectory, create it
-		if ( 
-		isset( $path_parts['dirname'] )
-		&& ! $view->file_exists( $basePath . '/' . $path_parts['dirname'] ) 
+		if (
+			isset($path_parts['dirname'])
+			&& !$view->file_exists($basePath . '/' . $path_parts['dirname'])
 		) {
-		
-			$view->mkdir( $basePath . '/' . $path_parts['dirname'] );
-			
+			$sub_dirs = explode(DIRECTORY_SEPARATOR, $basePath . '/' . $path_parts['dirname']);
+			$dir = '';
+			foreach ($sub_dirs as $sub_dir) {
+				$dir .= '/' . $sub_dir;
+				if (!$view->is_dir($dir)) {
+					$view->mkdir($dir);
+				}
+			}
 		}
-		
+
 		return $targetPath;
-	
-	}
 
-	/**
-	 * @brief Fetch the legacy encryption key from user files
-	 * @param string $login used to locate the legacy key
-	 * @param string $passphrase used to decrypt the legacy key
-	 * @return true / false
-	 *
-	 * if the key is left out, the default handler will be used
-	 */
-	public function getLegacyKey() {
-		
-		$user = \OCP\User::getUser();
-		$view = new \OC_FilesystemView( '/' . $user );
-		return $view->file_get_contents( 'encryption.key' );
-		
 	}
-	
 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 55cddf2bec81761ca0b6ccbcd27d7fbce7237219..0df34a38bd74e0e3102bebce151496e2e83d3964 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -1,41 +1,45 @@
 <?php
 
 /**
-* ownCloud
-*
-* @author Sam Tuke, Robin Appelman
-* @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman 
-* icewind1991@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Sam Tuke, Robin Appelman
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman
+ * icewind1991@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 /**
-* @brief Encryption proxy which handles filesystem operations before and after
-*        execution and encrypts, and handles keyfiles accordingly. Used for 
-*        webui.
-*/
+ * @brief Encryption proxy which handles filesystem operations before and after
+ *        execution and encrypts, and handles keyfiles accordingly. Used for
+ *        webui.
+ */
 
 namespace OCA\Encryption;
 
+/**
+ * Class Proxy
+ * @package OCA\Encryption
+ */
 class Proxy extends \OC_FileProxy {
 
 	private static $blackList = null; //mimetypes blacklisted from encryption
-	
+
 	private static $enableEncryption = null;
-	
+
 	/**
 	 * Check if a file requires encryption
 	 * @param string $path
@@ -43,347 +47,383 @@ class Proxy extends \OC_FileProxy {
 	 *
 	 * Tests if server side encryption is enabled, and file is allowed by blacklists
 	 */
-	private static function shouldEncrypt( $path ) {
-		
-		if ( is_null( self::$enableEncryption ) ) {
-		
-			if ( 
-				\OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true' 
-				&& Crypt::mode() == 'server' 
+	private static function shouldEncrypt($path) {
+
+		if (is_null(self::$enableEncryption)) {
+
+			if (
+				\OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true') === 'true'
+				&& Crypt::mode() === 'server'
 			) {
-			
+
 				self::$enableEncryption = true;
-			
+
 			} else {
-				
+
 				self::$enableEncryption = false;
-			
+
 			}
-			
+
 		}
-		
-		if ( !self::$enableEncryption ) {
-		
+
+		if (!self::$enableEncryption) {
+
 			return false;
-			
+
 		}
-		
-		if ( is_null(self::$blackList ) ) {
-		
-			self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
-			
+
+		if (is_null(self::$blackList)) {
+
+			self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
+
 		}
-		
-		if ( Crypt::isCatfile( $path ) ) {
-		
+
+		if (Crypt::isCatfileContent($path)) {
+
 			return true;
-			
+
 		}
-		
-		$extension = substr( $path, strrpos( $path, '.' ) +1 );
-		
-		if ( array_search( $extension, self::$blackList ) === false ) {
-		
+
+		$extension = substr($path, strrpos($path, '.') + 1);
+
+		if (array_search($extension, self::$blackList) === false) {
+
 			return true;
-			
+
 		}
-		
+
 		return false;
 	}
-	
-	public function preFile_put_contents( $path, &$data ) {
-		
-		if ( self::shouldEncrypt( $path ) ) {
-		
-			if ( !is_resource( $data ) ) { //stream put contents should have been converted to fopen
-			
-				$userId = \OCP\USER::getUser();
-				
-				$rootView = new \OC_FilesystemView( '/' );
-			
-				// Set the filesize for userland, before encrypting
-				$size = strlen( $data );
-				
-				// Disable encryption proxy to prevent recursive calls
-				\OC_FileProxy::$enabled = false;
-				
-				// TODO: Check if file is shared, if so, use multiKeyEncrypt
-				
-				// Encrypt plain data and fetch key
-				$encrypted = Crypt::keyEncryptKeyfile( $data, Keymanager::getPublicKey( $rootView, $userId ) );
-				
-				// Replace plain content with encrypted content by reference
-				$data = $encrypted['data'];
-				
-				$filePath = explode( '/', $path );
-				
-				$filePath = array_slice( $filePath, 3 );
-				
-				$filePath = '/' . implode( '/', $filePath );
-				
-				// TODO: make keyfile dir dynamic from app config
-				
-				$view = new \OC_FilesystemView( '/' );
-				
-				// Save keyfile for newly encrypted file in parallel directory tree
-				Keymanager::setFileKey( $view, $filePath, $userId, $encrypted['key'] );
-				
-				// Update the file cache with file info
-				\OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
-				
-				// Re-enable proxy - our work is done
-				\OC_FileProxy::$enabled = true;
-				
+
+	/**
+	 * @param $path
+	 * @param $data
+	 * @return bool
+	 */
+	public function preFile_put_contents($path, &$data) {
+
+		if (self::shouldEncrypt($path)) {
+
+			if (!is_resource($data)) {
+
+				// get root view
+				$view = new \OC_FilesystemView('/');
+
+				// get relative path
+				$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+				if (!isset($relativePath)) {
+					return true;
+				}
+
+				$handle = fopen('crypt://' . $relativePath . '.etmp', 'w');
+				if (is_resource($handle)) {
+
+					// write data to stream
+					fwrite($handle, $data);
+
+					// close stream
+					fclose($handle);
+
+					// disable encryption proxy to prevent recursive calls
+					$proxyStatus = \OC_FileProxy::$enabled;
+					\OC_FileProxy::$enabled = false;
+
+					// get encrypted content
+					$data = $view->file_get_contents($path . '.etmp');
+
+					// remove our temp file
+					$view->unlink($path . '.etmp');
+
+					// re-enable proxy - our work is done
+					\OC_FileProxy::$enabled = $proxyStatus;
+				}
 			}
 		}
-		
+
+		return true;
+
 	}
-	
+
 	/**
 	 * @param string $path Path of file from which has been read
 	 * @param string $data Data that has been read from file
 	 */
-	public function postFile_get_contents( $path, $data ) {
-	
-		// TODO: Use dependency injection to add required args for view and user etc. to this method
+	public function postFile_get_contents($path, $data) {
+
+		$plainData = null;
+		$view = new \OC_FilesystemView('/');
+
+		// get relative path
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+		// init session
+		$session = new \OCA\Encryption\Session($view);
 
-		// Disable encryption proxy to prevent recursive calls
-		\OC_FileProxy::$enabled = false;
-		
 		// If data is a catfile
-		if ( 
-			Crypt::mode() == 'server' 
-			&& Crypt::isCatfile( $data ) 
+		if (
+			Crypt::mode() === 'server'
+			&& Crypt::isCatfileContent($data)
 		) {
-			
-			$split = explode( '/', $path );
-			
-			$filePath = array_slice( $split, 3 );
-			
-			$filePath = '/' . implode( '/', $filePath );
-			
-			//$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-			
-			$view = new \OC_FilesystemView( '' );
-			
-			$userId = \OCP\USER::getUser();
-			
-			// TODO: Check if file is shared, if so, use multiKeyDecrypt
-			
-			$encryptedKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
-
-			$session = new Session();
-			
-			$decrypted = Crypt::keyDecryptKeyfile( $data, $encryptedKeyfile, $session->getPrivateKey( $split[1] ) );
-			
+
+			$handle = fopen('crypt://' . $relativePath, 'r');
+
+			if (is_resource($handle)) {
+				while (($plainDataChunk = fgets($handle, 8192)) !== false) {
+					$plainData .= $plainDataChunk;
+				}
+			}
+
 		} elseif (
-		Crypt::mode() == 'server' 
-		&& isset( $_SESSION['legacyenckey'] )
-		&& Crypt::isEncryptedMeta( $path ) 
+			Crypt::mode() == 'server'
+			&& \OC::$session->exists('legacyenckey')
+			&& Crypt::isEncryptedMeta($path)
 		) {
-			
-			$decrypted = Crypt::legacyDecrypt( $data, $_SESSION['legacyenckey'] );
-			
+			// Disable encryption proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
+			$plainData = Crypt::legacyBlockDecrypt($data, $session->getLegacyKey());
+
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
-		
-		\OC_FileProxy::$enabled = true;
-		
-		if ( ! isset( $decrypted ) ) {
-		
-			$decrypted = $data;
-			
+
+		if (!isset($plainData)) {
+
+			$plainData = $data;
+
 		}
-		
-		return $decrypted;
-		
+
+		return $plainData;
+
 	}
-	
+
 	/**
 	 * @brief When a file is deleted, remove its keyfile also
 	 */
-	public function preUnlink( $path ) {
-	
+	public function preUnlink($path) {
+
+		// let the trashbin handle this  
+		if (\OCP\App::isEnabled('files_trashbin')) {
+			return true;
+		}
+
 		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		
-		$view = new \OC_FilesystemView( '/' );
-		
+
+		$view = new \OC_FilesystemView('/');
+
 		$userId = \OCP\USER::getUser();
-		
-		// Format path to be relative to user files dir
-		$trimmed = ltrim( $path, '/' );
-		$split = explode( '/', $trimmed );
-		$sliced = array_slice( $split, 2 );
-		$relPath = implode( '/', $sliced );
-		
-		if ( $view->is_dir( $path ) ) {
-			
-			// Dirs must be handled separately as deleteFileKey 
-			// doesn't handle them
-			$view->unlink( $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/'. $relPath );
-			
-		} else {
-		
-			// Delete keyfile so it isn't orphaned
-			$result = Keymanager::deleteFileKey( $view, $userId, $relPath );
-		
-			\OC_FileProxy::$enabled = true;
-			
-			return $result;
-		
+
+		$util = new Util($view, $userId);
+
+		// get relative path
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+		list($owner, $ownerPath) = $util->getUidAndFilename($relativePath);
+
+		// Delete keyfile & shareKey so it isn't orphaned
+		if (!Keymanager::deleteFileKey($view, $owner, $ownerPath)) {
+			\OCP\Util::writeLog('Encryption library',
+				'Keyfile or shareKey could not be deleted for file "' . $ownerPath . '"', \OCP\Util::ERROR);
 		}
-	
+
+		Keymanager::delAllShareKeys($view, $owner, $ownerPath);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// If we don't return true then file delete will fail; better
+		// to leave orphaned keyfiles than to disallow file deletion
+		return true;
+
 	}
 
 	/**
-	 * @brief When a file is renamed, rename its keyfile also
-	 * @return bool Result of rename()
-	 * @note This is pre rather than post because using post didn't work
+	 * @param $path
+	 * @return bool
 	 */
-	public function preRename( $oldPath, $newPath ) {
-		
-		// Disable encryption proxy to prevent recursive calls
-		\OC_FileProxy::$enabled = false;
-		
-		$view = new \OC_FilesystemView( '/' );
-		
-		$userId = \OCP\USER::getUser();
-	
-		// Format paths to be relative to user files dir
-		$oldTrimmed = ltrim( $oldPath, '/' );
-		$oldSplit = explode( '/', $oldTrimmed );
-		$oldSliced = array_slice( $oldSplit, 2 );
-		$oldRelPath = implode( '/', $oldSliced );
-		$oldKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $oldRelPath . '.key';
-		
-		$newTrimmed = ltrim( $newPath, '/' );
-		$newSplit = explode( '/', $newTrimmed );
-		$newSliced = array_slice( $newSplit, 2 );
-		$newRelPath = implode( '/', $newSliced );
-		$newKeyfilePath = $userId . '/' . 'files_encryption' . '/' . 'keyfiles' . '/' . $newRelPath . '.key';
-		
-		// Rename keyfile so it isn't orphaned
-		$result = $view->rename( $oldKeyfilePath, $newKeyfilePath );
-		
-		\OC_FileProxy::$enabled = true;
-		
-		return $result;
-	
+	public function postTouch($path) {
+		$this->handleFile($path);
+
+		return true;
 	}
-	
-	public function postFopen( $path, &$result ){
-	
-		if ( !$result ) {
-		
+
+	/**
+	 * @param $path
+	 * @param $result
+	 * @return resource
+	 */
+	public function postFopen($path, &$result) {
+
+		if (!$result) {
+
 			return $result;
-			
+
 		}
-		
-		// Reformat path for use with OC_FSV
-		$path_split = explode( '/', $path );
-		$path_f = implode( array_slice( $path_split, 3 ) );
-		
+
+		// split the path parts
+		$pathParts = explode('/', $path);
+
+		// get relative path
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+		// FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
+		if (isset($pathParts[2]) && $pathParts[2] === 'cache') {
+			return $result;
+		}
+
 		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		
-		$meta = stream_get_meta_data( $result );
-		
-		$view = new \OC_FilesystemView( '' );
-		
-		$util = new Util( $view, \OCP\USER::getUser());
-		
+
+		$meta = stream_get_meta_data($result);
+
+		$view = new \OC_FilesystemView('');
+
+		$util = new Util($view, \OCP\USER::getUser());
+
 		// If file is already encrypted, decrypt using crypto protocol
-		if ( 
-			Crypt::mode() == 'server' 
-			&& $util->isEncryptedPath( $path ) 
+		if (
+			Crypt::mode() === 'server'
+			&& $util->isEncryptedPath($path)
 		) {
-			
+
 			// Close the original encrypted file
-			fclose( $result );
-			
+			fclose($result);
+
 			// Open the file using the crypto stream wrapper 
 			// protocol and let it do the decryption work instead
-			$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
-			
-			
-		} elseif ( 
-			self::shouldEncrypt( $path ) 
-			and $meta ['mode'] != 'r' 
-			and $meta['mode'] != 'rb' 
+			$result = fopen('crypt://' . $relativePath, $meta['mode']);
+
+		} elseif (
+			self::shouldEncrypt($path)
+			and $meta ['mode'] !== 'r'
+				and $meta['mode'] !== 'rb'
 		) {
-		// If the file is not yet encrypted, but should be 
-		// encrypted when it's saved (it's not read only)
-		
-		// NOTE: this is the case for new files saved via WebDAV
-		
-			if ( 
-			$view->file_exists( $path ) 
-			and $view->filesize( $path ) > 0 
-			) {
-				$x = $view->file_get_contents( $path );
-				
-				$tmp = tmpfile();
-				
-// 				// Make a temporary copy of the original file
-// 				\OCP\Files::streamCopy( $result, $tmp );
-// 				
-// 				// Close the original stream, we'll return another one
-// 				fclose( $result );
-// 				
-// 				$view->file_put_contents( $path_f, $tmp );
-// 				
-// 				fclose( $tmp );
-			
-			}
-			
-			$result = fopen( 'crypt://'.$path_f, $meta['mode'] );
-		
+			$result = fopen('crypt://' . $relativePath, $meta['mode']);
 		}
-		
+
 		// Re-enable the proxy
-		\OC_FileProxy::$enabled = true;
-		
+		\OC_FileProxy::$enabled = $proxyStatus;
+
 		return $result;
-	
-	}
 
-	public function postGetMimeType( $path, $mime ) {
-		
-		if ( Crypt::isCatfile( $path ) ) {
-		
-			$mime = \OCP\Files::getMimeType( 'crypt://' . $path, 'w' );
-		
-		}
-		
-		return $mime;
-		
 	}
 
-	public function postStat( $path, $data ) {
-	
-		if ( Crypt::isCatfile( $path ) ) {
-		
-			$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-			
-			$data['size'] = $cached['size'];
-			
+	/**
+	 * @param $path
+	 * @param $data
+	 * @return array
+	 */
+	public function postGetFileInfo($path, $data) {
+
+		// if path is a folder do nothing
+		if (is_array($data) && array_key_exists('size', $data)) {
+
+			// Disable encryption proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
+			// get file size
+			$data['size'] = self::postFileSize($path, $data['size']);
+
+			// Re-enable the proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
-		
+
 		return $data;
 	}
 
-	public function postFileSize( $path, $size ) {
-		
-		if ( Crypt::isCatfile( $path ) ) {
-			
-			$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
-			
-			return  $cached['size'];
-		
-		} else {
-		
+	/**
+	 * @param $path
+	 * @param $size
+	 * @return bool
+	 */
+	public function postFileSize($path, $size) {
+
+		$view = new \OC_FilesystemView('/');
+
+		// if path is a folder do nothing
+		if ($view->is_dir($path)) {
 			return $size;
-			
 		}
+
+		// get relative path
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+		// if path is empty we cannot resolve anything
+		if (empty($relativePath)) {
+			return $size;
+		}
+
+		$fileInfo = false;
+		// get file info from database/cache if not .part file
+		if (!Keymanager::isPartialFilePath($path)) {
+			$fileInfo = $view->getFileInfo($path);
+		}
+
+		// if file is encrypted return real file size
+		if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+			$size = $fileInfo['unencrypted_size'];
+		} else {
+			// self healing if file was removed from file cache
+			if (!is_array($fileInfo)) {
+				$fileInfo = array();
+			}
+
+			$userId = \OCP\User::getUser();
+			$util = new Util($view, $userId);
+			$fixSize = $util->getFileSize($path);
+			if ($fixSize > 0) {
+				$size = $fixSize;
+
+				$fileInfo['encrypted'] = true;
+				$fileInfo['unencrypted_size'] = $size;
+
+				// put file info if not .part file
+				if (!Keymanager::isPartialFilePath($relativePath)) {
+					$view->putFileInfo($path, $fileInfo);
+				}
+			}
+
+		}
+		return $size;
+	}
+
+	/**
+	 * @param $path
+	 */
+	public function handleFile($path) {
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$view = new \OC_FilesystemView('/');
+		$session = new \OCA\Encryption\Session($view);
+		$userId = \OCP\User::getUser();
+		$util = new Util($view, $userId);
+
+		// split the path parts
+		$pathParts = explode('/', $path);
+
+		// get relative path
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+		// only if file is on 'files' folder fix file size and sharing
+		if (isset($pathParts[2]) && $pathParts[2] === 'files' && $util->fixFileSize($path)) {
+
+			// get sharing app state
+			$sharingEnabled = \OCP\Share::isEnabled();
+
+			// get users
+			$usersSharing = $util->getSharingUsersArray($sharingEnabled, $relativePath);
+
+			// update sharing-keys
+			$util->setSharedFileKeyfiles($session, $usersSharing, $relativePath);
+		}
+
+		\OC_FileProxy::$enabled = $proxyStatus;
 	}
 }
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 769a40b359f4f7249c9fcc44353de603f66cdd63..bff1737554b4bea7a231135ec6affc4d341a7fef 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -28,76 +28,164 @@ namespace OCA\Encryption;
 
 class Session {
 
+	private $view;
+
+	/**
+	 * @brief if session is started, check if ownCloud key pair is set up, if not create it
+	 * @param \OC_FilesystemView $view
+	 *
+	 * @note The ownCloud key pair is used to allow public link sharing even if encryption is enabled
+	 */
+	public function __construct($view) {
+
+		$this->view = $view;
+
+		if (!$this->view->is_dir('owncloud_private_key')) {
+
+			$this->view->mkdir('owncloud_private_key');
+
+		}
+
+		$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+		if ($publicShareKeyId === null) {
+			$publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
+			\OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
+		}
+
+		if (
+			!$this->view->file_exists("/public-keys/" . $publicShareKeyId . ".public.key")
+			|| !$this->view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".private.key")
+		) {
+
+			$keypair = Crypt::createKeypair();
+
+			// Disable encryption proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
+			// Save public key
+
+			if (!$view->is_dir('/public-keys')) {
+				$view->mkdir('/public-keys');
+			}
+
+			$this->view->file_put_contents('/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey']);
+
+			// Encrypt private key empty passphrase
+			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '');
+
+			// Save private key
+			$this->view->file_put_contents(
+				'/owncloud_private_key/' . $publicShareKeyId . '.private.key', $encryptedPrivateKey);
+
+			\OC_FileProxy::$enabled = $proxyStatus;
+
+		}
+
+		if (\OCA\Encryption\Helper::isPublicAccess()) {
+			// Disable encryption proxy to prevent recursive calls
+			$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 );
+
+			\OC_FileProxy::$enabled = $proxyStatus;
+		}
+	}
+
 	/**
 	 * @brief Sets user private key to session
+	 * @param string $privateKey
 	 * @return bool
 	 *
+	 * @note this should only be set on login
 	 */
-	public function setPrivateKey( $privateKey ) {
-	
-		$_SESSION['privateKey'] = $privateKey;
-		
+	public function setPrivateKey($privateKey) {
+
+		\OC::$session->set('privateKey', $privateKey);
+
 		return true;
-		
+
 	}
-	
+
 	/**
-	 * @brief Gets user private key from session
+	 * @brief Gets user or public share private key from session
 	 * @returns string $privateKey The user's plaintext private key
 	 *
 	 */
 	public function getPrivateKey() {
-	
-		if ( 
-			isset( $_SESSION['privateKey'] )
-			&& !empty( $_SESSION['privateKey'] )
-		) {
-		
-			return $_SESSION['privateKey'];
-		
+		// return the public share private key if this is a public access
+		if (\OCA\Encryption\Helper::isPublicAccess()) {
+			return $this->getPublicSharePrivateKey();
 		} else {
-		
-			return false;
-			
+			if (!is_null( \OC::$session->get('privateKey') )) {
+				return \OC::$session->get('privateKey');
+			} else {
+				return false;
+			}
 		}
-		
 	}
-	
+
 	/**
-	 * @brief Sets user legacy key to session
+	 * @brief Sets public user private key to session
+	 * @param string $privateKey
 	 * @return bool
+	 */
+	public function setPublicSharePrivateKey($privateKey) {
+
+			\OC::$session->set('publicSharePrivateKey', $privateKey);
+
+		return true;
+
+	}
+
+	/**
+	 * @brief Gets public share private key from session
+	 * @returns string $privateKey
 	 *
 	 */
-	public function setLegacyKey( $legacyKey ) {
-	
-		if ( $_SESSION['legacyKey'] = $legacyKey ) {
-		
-			return true;
-			
+	public function getPublicSharePrivateKey() {
+
+		if (!is_null( \OC::$session->get('publicSharePrivateKey') )) {
+			return \OC::$session->get('publicSharePrivateKey');
+		} else {
+			return false;
 		}
-		
 	}
-	
+
+
+	/**
+	 * @brief Sets user legacy key to session
+	 * @param $legacyKey
+	 * @return bool
+	 */
+	public function setLegacyKey($legacyKey) {
+
+		\OC::$session->set('legacyKey', $legacyKey);
+
+		return true;
+	}
+
 	/**
 	 * @brief Gets user legacy key from session
 	 * @returns string $legacyKey The user's plaintext legacy key
 	 *
 	 */
 	public function getLegacyKey() {
-	
-		if ( 
-			isset( $_SESSION['legacyKey'] )
-			&& !empty( $_SESSION['legacyKey'] )
-		) {
-		
-			return $_SESSION['legacyKey'];
-		
+
+		if ( !is_null( \OC::$session->get('legacyKey') ) ) {
+
+			return \OC::$session->get('legacyKey');
+
 		} else {
-		
+
 			return false;
-			
+
 		}
-		
+
 	}
 
-}
\ No newline at end of file
+}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 65d7d57a05a740bd164e7476b1c3910afcd7f49f..072c52866445e91f7157a739ca2e939ccdc846b7 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Robin Appelman
- * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman 
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman
  * <icewind1991@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -32,27 +32,28 @@ namespace OCA\Encryption;
 
 /**
  * @brief Provides 'crypt://' stream wrapper protocol.
- * @note We use a stream wrapper because it is the most secure way to handle 
+ * @note We use a stream wrapper because it is the most secure way to handle
  * decrypted content transfers. There is no safe way to decrypt the entire file
  * somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
  * @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
- * crypt://filename, or crypt://subdirectory/filename, NOT 
- * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in 
- * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and 
+ * crypt://filename, or crypt://subdirectory/filename, NOT
+ * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in
+ * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and
  * will not be accessible to other methods.
- * @note Data read and written must always be 8192 bytes long, as this is the 
- * buffer size used internally by PHP. The encryption process makes the input 
- * data longer, and input is chunked into smaller pieces in order to result in 
+ * @note Data read and written must always be 8192 bytes long, as this is the
+ * buffer size used internally by PHP. The encryption process makes the input
+ * data longer, and input is chunked into smaller pieces in order to result in
  * a 8192 encrypted block size.
+ * @note When files are deleted via webdav, or when they are updated and the
+ * previous version deleted, this is handled by OC\Files\View, and thus the
+ * encryption proxies are used and keyfiles deleted.
  */
 class Stream {
+	private $plainKey;
+	private $encKeyfiles;
 
-	public static $sourceStreams = array();
-
-	// TODO: make all below properties private again once unit testing is 
-	// configured correctly
-	public $rawPath; // The raw path received by stream_open
-	public $path_f; // The raw path formatted to include username and data dir
+	private $rawPath; // The raw path relative to the data dir
+	private $relPath; // rel path to users file dir
 	private $userId;
 	private $handle; // Resource returned by fopen
 	private $path;
@@ -60,226 +61,191 @@ class Stream {
 	private $meta = array(); // Header / meta for source stream
 	private $count;
 	private $writeCache;
-	public $size;
+	private $size;
+	private $unencryptedSize;
 	private $publicKey;
 	private $keyfile;
 	private $encKeyfile;
 	private static $view; // a fsview object set to user dir
 	private $rootView; // a fsview object set to '/'
 
-	public function stream_open( $path, $mode, $options, &$opened_path ) {
-		
-		// Get access to filesystem via filesystemview object
-		if ( !self::$view ) {
-
-			self::$view = new \OC_FilesystemView( $this->userId . '/' );
+	/**
+	 * @param $path
+	 * @param $mode
+	 * @param $options
+	 * @param $opened_path
+	 * @return bool
+	 */
+	public function stream_open($path, $mode, $options, &$opened_path) {
 
+		if (!isset($this->rootView)) {
+			$this->rootView = new \OC_FilesystemView('/');
 		}
-		
-		// Set rootview object if necessary
-		if ( ! $this->rootView ) {
 
-			$this->rootView = new \OC_FilesystemView( $this->userId . '/' );
+		$util = new Util($this->rootView, \OCP\USER::getUser());
 
-		}
-		
-		$this->userId = \OCP\User::getUser();
-		
-		// Get the bare file path
-		$path = str_replace( 'crypt://', '', $path );
-		
-		$this->rawPath = $path;
-		
-		$this->path_f = $this->userId . '/files/' . $path;
-		
-		if ( 
-		dirname( $path ) == 'streams' 
-		and isset( self::$sourceStreams[basename( $path )] ) 
-		) {
-		
-			// Is this just for unit testing purposes?
+		$this->userId = $util->getUserId();
 
-			$this->handle = self::$sourceStreams[basename( $path )]['stream'];
+		// Strip identifier text from path, this gives us the path relative to data/<user>/files
+		$this->relPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
 
-			$this->path = self::$sourceStreams[basename( $path )]['path'];
+		// rawPath is relative to the data directory
+		$this->rawPath = $util->getUserFilesDir() . $this->relPath;
 
-			$this->size = self::$sourceStreams[basename( $path )]['size'];
+		// Disable fileproxies so we can get the file size and open the source file without recursive encryption
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 
-		} else {
+		if (
+			$mode === 'w'
+			or $mode === 'w+'
+			or $mode === 'wb'
+			or $mode === 'wb+'
+		) {
 
-			if ( 
-			$mode == 'w' 
-			or $mode == 'w+' 
-			or $mode == 'wb' 
-			or $mode == 'wb+' 
-			) {
+			// We're writing a new file so start write counter with 0 bytes
+			$this->size = 0;
+			$this->unencryptedSize = 0;
 
-				$this->size = 0;
+		} else {
 
-			} else {
-				
-				
-				
-				$this->size = self::$view->filesize( $this->path_f, $mode );
-				
-				//$this->size = filesize( $path );
-				
-			}
+			$this->size = $this->rootView->filesize($this->rawPath, $mode);
+		}
 
-			// Disable fileproxies so we can open the source file without recursive encryption
-			\OC_FileProxy::$enabled = false;
+		$this->handle = $this->rootView->fopen($this->rawPath, $mode);
 
-			//$this->handle = fopen( $path, $mode );
-			
-			$this->handle = self::$view->fopen( $this->path_f, $mode );
-			
-			\OC_FileProxy::$enabled = true;
+		\OC_FileProxy::$enabled = $proxyStatus;
 
-			if ( !is_resource( $this->handle ) ) {
+		if (!is_resource($this->handle)) {
 
-				\OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
+			\OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
 
-			}
+		} else {
+
+			$this->meta = stream_get_meta_data($this->handle);
 
 		}
 
-		if ( is_resource( $this->handle ) ) {
 
-			$this->meta = stream_get_meta_data( $this->handle );
+		return is_resource($this->handle);
 
-		}
+	}
 
-		return is_resource( $this->handle );
+	/**
+	 * @param $offset
+	 * @param int $whence
+	 */
+	public function stream_seek($offset, $whence = SEEK_SET) {
 
-	}
-	
-	public function stream_seek( $offset, $whence = SEEK_SET ) {
-	
 		$this->flush();
-		
-		fseek( $this->handle, $offset, $whence );
-		
-	}
-	
-	public function stream_tell() {
-		return ftell($this->handle);
+
+		fseek($this->handle, $offset, $whence);
+
 	}
-	
-	public function stream_read( $count ) {
-	
+
+	/**
+	 * @param $count
+	 * @return bool|string
+	 * @throws \Exception
+	 */
+	public function stream_read($count) {
+
 		$this->writeCache = '';
 
-		if ( $count != 8192 ) {
-			
+		if ($count !== 8192) {
+
 			// $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('files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
 
 			die();
 
 		}
 
-// 		$pos = ftell( $this->handle );
-// 
 		// Get the data from the file handle
-		$data = fread( $this->handle, 8192 );
- 
-		if ( strlen( $data ) ) {
-			
-			$this->getKey();
-			
-			$result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
-			
-		} else {
+		$data = fread($this->handle, 8192);
 
-			$result = '';
+		$result = '';
 
-		}
+		if (strlen($data)) {
+
+			if (!$this->getKey()) {
+
+				// Error! We don't have a key to decrypt the file with
+				throw new \Exception(
+					'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
+
+			}
+
+			// Decrypt data
+			$result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
 
-// 		$length = $this->size - $pos;
-// 
-// 		if ( $length < 8192 ) {
-// 
-// 			$result = substr( $result, 0, $length );
-// 
-// 		}
+		}
 
 		return $result;
 
 	}
-	
+
 	/**
 	 * @brief Encrypt and pad data ready for writing to disk
 	 * @param string $plainData data to be encrypted
 	 * @param string $key key to use for encryption
-	 * @return encrypted data on success, false on failure
+	 * @return string encrypted data on success, false on failure
 	 */
-	public function preWriteEncrypt( $plainData, $key ) {
-		
+	public function preWriteEncrypt($plainData, $key) {
+
 		// Encrypt data to 'catfile', which includes IV
-		if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
-		
-			return $encrypted; 
-			
+		if ($encrypted = Crypt::symmetricEncryptFileContent($plainData, $key)) {
+
+			return $encrypted;
+
 		} else {
-		
+
 			return false;
-			
+
 		}
-		
+
 	}
-	
+
 	/**
-	 * @brief Get the keyfile for the current file, generate one if necessary
-	 * @param bool $generate if true, a new key will be generated if none can be found
+	 * @brief Fetch the plain encryption key for the file and set it as plainKey property
+	 * @internal param bool $generate if true, a new key will be generated if none can be found
 	 * @return bool true on key found and set, false on key not found and new key generated and set
 	 */
 	public function getKey() {
-		
-		// If a keyfile already exists for a file named identically to 
-		// file to be written
-		if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
-		
-			// TODO: add error handling for when file exists but no 
-			// keyfile
-			
-			// Fetch existing keyfile
-			$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->rawPath );
-			
-			$this->getUser();
-			
-			$session = new Session();
-			
-			$privateKey = $session->getPrivateKey( $this->userId );
-			
-			$this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey );
-			
+
+		// Check if key is already set
+		if (isset($this->plainKey) && isset($this->encKeyfile)) {
+
 			return true;
-			
+
+		}
+
+		// Fetch and decrypt keyfile
+		// Fetch existing keyfile
+		$this->encKeyfile = Keymanager::getFileKey($this->rootView, $this->userId, $this->relPath);
+
+		// If a keyfile already exists
+		if ($this->encKeyfile) {
+
+			$session = new \OCA\Encryption\Session( $this->rootView );
+
+			$privateKey = $session->getPrivateKey($this->userId);
+
+			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+
+			$this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $privateKey);
+
+			return true;
+
 		} else {
-		
+
 			return false;
-		
-		}
-		
-	}
-	
-	public function getuser() {
-	
-		// Only get the user again if it isn't already set
-		if ( empty( $this->userId ) ) {
-	
-			// TODO: Move this user call out of here - it belongs 
-			// elsewhere
-			$this->userId = \OCP\User::getUser();
-		
+
 		}
-		
-		// TODO: Add a method for getting the user in case OCP\User::
-		// getUser() doesn't work (can that scenario ever occur?)
-		
+
 	}
-	
+
 	/**
 	 * @brief Handle plain data from the stream, and write it in 8192 byte blocks
 	 * @param string $data data to be written to disk
@@ -289,99 +255,55 @@ class Stream {
 	 * @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
 	 * @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
 	 */
-	public function stream_write( $data ) {
-		
+	public function stream_write($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 
 		// get into an infinite loop
+		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		
+
 		// Get the length of the unencrypted data that we are handling
-		$length = strlen( $data );
-		
-		// So far this round, no data has been written
-		$written = 0;
-		
-		// Find out where we are up to in the writing of data to the 
+		$length = strlen($data);
+
+		// Find out where we are up to in the writing of data to the
 		// file
-		$pointer = ftell( $this->handle );
-		
-		// Make sure the userId is set
-		$this->getuser();
-		
-		// TODO: Check if file is shared, if so, use multiKeyEncrypt and
-		// save shareKeys in necessary user directories
-		
+		$pointer = ftell($this->handle);
+
 		// Get / generate the keyfile for the file we're handling
 		// If we're writing a new file (not overwriting an existing 
 		// one), save the newly generated keyfile
-		if ( ! $this->getKey() ) {
-		
-			$this->keyfile = Crypt::generateKey();
-			
-			$this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
-			
-			$this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
-			
-			$view = new \OC_FilesystemView( '/' );
-			$userId = \OCP\User::getUser();
-			
-			// Save the new encrypted file key
-			Keymanager::setFileKey( $view, $this->rawPath, $userId, $this->encKeyfile );
-			
+		if (!$this->getKey()) {
+
+			$this->plainKey = Crypt::generateKey();
+
 		}
 
 		// If extra data is left over from the last round, make sure it 
 		// is integrated into the next 6126 / 8192 block
-		if ( $this->writeCache ) {
-			
+		if ($this->writeCache) {
+
 			// Concat writeCache to start of $data
 			$data = $this->writeCache . $data;
-			
-			// Clear the write cache, ready for resuse - it has been
+
+			// Clear the write cache, ready for reuse - it has been
 			// flushed and its old contents processed
 			$this->writeCache = '';
 
 		}
-// 		
-// 		// Make sure we always start on a block start
-		if ( 0 != ( $pointer % 8192 ) ) { 
-		// if the current position of 
-		// file indicator is not aligned to a 8192 byte block, fix it 
-		// so that it is
-
-// 			fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
-// 			
-// 			$pointer = ftell( $this->handle );
-// 
-// 			$unencryptedNewBlock = fread( $this->handle, 8192 );
-// 			
-// 			fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-// 
-// 			$block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
-// 
-// 			$x =  substr( $block, 0, $currentPos % 8192 );
-// 
-// 			$data = $x . $data;
-// 			
-// 			fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
-// 
-		}
 
-// 		$currentPos = ftell( $this->handle );
-		
-// 		// While there still remains somed data to be processed & written
-		while( strlen( $data ) > 0 ) {
-// 			
-// 			// Remaining length for this iteration, not of the 
-//			// entire file (may be greater than 8192 bytes)
-// 			$remainingLength = strlen( $data );
-// 			
-// 			// If data remaining to be written is less than the 
-//			// size of 1 6126 byte block
-			if ( strlen( $data ) < 6126 ) {
-				
+		// While there still remains some data to be processed & written
+		while (strlen($data) > 0) {
+
+			// Remaining length for this iteration, not of the
+			// entire file (may be greater than 8192 bytes)
+			$remainingLength = strlen($data);
+
+			// If data remaining to be written is less than the
+			// size of 1 6126 byte block
+			if ($remainingLength < 6126) {
+
 				// Set writeCache to contents of $data
 				// The writeCache will be carried over to the 
 				// next write round, and added to the start of 
@@ -394,101 +316,167 @@ class Stream {
 
 				// Clear $data ready for next round
 				$data = '';
-// 
+
 			} else {
-				
+
 				// Read the chunk from the start of $data
-				$chunk = substr( $data, 0, 6126 );
-				
-				$encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
-				
+				$chunk = substr($data, 0, 6126);
+
+				$encrypted = $this->preWriteEncrypt($chunk, $this->plainKey);
+
 				// Write the data chunk to disk. This will be 
 				// attended to the last data chunk if the file
 				// being handled totals more than 6126 bytes
-				fwrite( $this->handle, $encrypted );
-				
-				$writtenLen = strlen( $encrypted );
-				//fseek( $this->handle, $writtenLen, SEEK_CUR );
+				fwrite($this->handle, $encrypted);
 
-				// Remove the chunk we just processed from 
+				// Remove the chunk we just processed from
 				// $data, leaving only unprocessed data in $data
 				// var, for handling on the next round
-				$data = substr( $data, 6126 );
+				$data = substr($data, 6126);
 
 			}
-		
+
 		}
 
-		$this->size = max( $this->size, $pointer + $length );
-		
+		$this->size = max($this->size, $pointer + $length);
+		$this->unencryptedSize += $length;
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
 		return $length;
 
 	}
 
 
-	public function stream_set_option( $option, $arg1, $arg2 ) {
-		switch($option) {
+	/**
+	 * @param $option
+	 * @param $arg1
+	 * @param $arg2
+	 */
+	public function stream_set_option($option, $arg1, $arg2) {
+		$return = false;
+		switch ($option) {
 			case STREAM_OPTION_BLOCKING:
-				stream_set_blocking( $this->handle, $arg1 );
+				$return = stream_set_blocking($this->handle, $arg1);
 				break;
 			case STREAM_OPTION_READ_TIMEOUT:
-				stream_set_timeout( $this->handle, $arg1, $arg2 );
+				$return = stream_set_timeout($this->handle, $arg1, $arg2);
 				break;
 			case STREAM_OPTION_WRITE_BUFFER:
-				stream_set_write_buffer( $this->handle, $arg1, $arg2 );
+				$return = stream_set_write_buffer($this->handle, $arg1);
 		}
+
+		return $return;
 	}
 
+	/**
+	 * @return array
+	 */
 	public function stream_stat() {
 		return fstat($this->handle);
 	}
-	
-	public function stream_lock( $mode ) {
-		flock( $this->handle, $mode );
+
+	/**
+	 * @param $mode
+	 */
+	public function stream_lock($mode) {
+		return flock($this->handle, $mode);
 	}
-	
+
+	/**
+	 * @return bool
+	 */
 	public function stream_flush() {
-	
-		return fflush( $this->handle ); 
+
+		return fflush($this->handle);
 		// Not a typo: http://php.net/manual/en/function.fflush.php
-		
+
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function stream_eof() {
 		return feof($this->handle);
 	}
 
 	private function flush() {
-		
-		if ( $this->writeCache ) {
-			
+
+		if ($this->writeCache) {
+
 			// Set keyfile property for file in question
 			$this->getKey();
-			
-			$encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
-			
-			fwrite( $this->handle, $encrypted );
-			
+
+			$encrypted = $this->preWriteEncrypt($this->writeCache, $this->plainKey);
+
+			fwrite($this->handle, $encrypted);
+
 			$this->writeCache = '';
-		
+
 		}
-	
+
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function stream_close() {
-	
+
 		$this->flush();
 
-		if ( 
-		$this->meta['mode']!='r' 
-		and $this->meta['mode']!='rb' 
+		if (
+			$this->meta['mode'] !== 'r'
+			and $this->meta['mode'] !== 'rb'
+				and $this->size > 0
 		) {
+			// Disable encryption proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
+			// Fetch user's public key
+			$this->publicKey = Keymanager::getPublicKey($this->rootView, $this->userId);
+
+			// Check if OC sharing api is enabled
+			$sharingEnabled = \OCP\Share::isEnabled();
+
+			$util = new Util($this->rootView, $this->userId);
+
+			// Get all users sharing the file includes current user
+			$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+
+			// Fetch public keys for all sharing users
+			$publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
+
+			// 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']);
+
+			// get file info
+			$fileInfo = $view->getFileInfo($this->rawPath);
+			if (!is_array($fileInfo)) {
+				$fileInfo = array();
+			}
+
+			// Re-enable proxy - our work is done
+			\OC_FileProxy::$enabled = $proxyStatus;
 
-			\OC\Files\Filesystem::putFileInfo( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
+			// set encryption data
+			$fileInfo['encrypted'] = true;
+			$fileInfo['size'] = $this->size;
+			$fileInfo['unencrypted_size'] = $this->unencryptedSize;
 
+			// set fileinfo
+			$view->putFileInfo($this->rawPath, $fileInfo);
 		}
 
-		return fclose( $this->handle );
+		return fclose($this->handle);
 
 	}
 
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 52bc74db27a61ee0c26af4e2b2cffdca8b2df419..04bd4dc8aca5711678bbbef1d0c7b22ff6885de2 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -3,8 +3,8 @@
  * ownCloud
  *
  * @author Sam Tuke, Frank Karlitschek
- * @copyright 2012 Sam Tuke samtuke@owncloud.com, 
- * Frank Karlitschek frank@owncloud.org
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>,
+ * Frank Karlitschek <frank@owncloud.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,78 +21,82 @@
  *
  */
 
-// Todo:
+# Bugs
+# ----
+# Sharing a file to a user without encryption set up will not provide them with access but won't notify the sharer
+# Sharing all files to admin for recovery purposes still in progress
+# Possibly public links are broken (not tested since last merge of master)
+
+
+# Missing features
+# ----------------
+# Make sure user knows if large files weren't encrypted
+
+
+# Test
+# ----
+# Test that writing files works when recovery is enabled, and sharing API is disabled
+# Test trashbin support
+
+
+// Old Todo:
 //  - Crypt/decrypt button in the userinterface
 //  - Setting if crypto should be on by default
 //  - Add a setting "Don´t encrypt files larger than xx because of performance 
 //    reasons"
-//  - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is 
-//    encrypted (.encrypted extension)
-//  - Don't use a password directly as encryption key. but a key which is 
-//    stored on the server and encrypted with the user password. -> password 
-//    change faster
-//  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
 
 namespace OCA\Encryption;
 
 /**
  * @brief Class for utilities relating to encrypted file storage system
- * @param OC_FilesystemView $view expected to have OC '/' as root path
+ * @param \OC_FilesystemView $view expected to have OC '/' as root path
  * @param string $userId ID of the logged in user
  * @param int $client indicating status of client side encryption. Currently
  * unused, likely to become obsolete shortly
  */
 
 class Util {
-	
-	
+
 	// Web UI:
-	
+
 	//// DONE: files created via web ui are encrypted
 	//// DONE: file created & encrypted via web ui are readable in web ui
 	//// DONE: file created & encrypted via web ui are readable via webdav
-	
-	
+
+
 	// WebDAV:
-	
+
 	//// DONE: new data filled files added via webdav get encrypted
 	//// DONE: new data filled files added via webdav are readable via webdav
 	//// DONE: reading unencrypted files when encryption is enabled works via 
 	////       webdav
 	//// DONE: files created & encrypted via web ui are readable via webdav
-	
-	
+
+
 	// Legacy support:
-	
+
 	//// DONE: add method to check if file is encrypted using new system
 	//// DONE: add method to check if file is encrypted using old system
 	//// DONE: add method to fetch legacy key
 	//// DONE: add method to decrypt legacy encrypted data
-	
-	
+
+
 	// Admin UI:
-	
+
 	//// DONE: changing user password also changes encryption passphrase
-	
+
 	//// TODO: add support for optional recovery in case of lost passphrase / keys
 	//// TODO: add admin optional required long passphrase for users
-	//// TODO: add UI buttons for encrypt / decrypt everything
 	//// TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
-	
-	
-	// Sharing:
-	
-	//// TODO: add support for encrypting to multiple public keys
-	//// TODO: add support for decrypting to multiple private keys
-	
-	
+
+
 	// Integration testing:
-	
+
 	//// TODO: test new encryption with versioning
-	//// TODO: test new encryption with sharing
+	//// DONE: test new encryption with sharing
 	//// TODO: test new encryption with proxies
-	
-	
+
+
 	private $view; // OC_FilesystemView object for filesystem operations
 	private $userId; // ID of the currently logged-in user
 	private $pwd; // User Password
@@ -103,166 +107,322 @@ class Util {
 	private $shareKeysPath; // Dir containing env keys for shared files
 	private $publicKeyPath; // Path to user's public key
 	private $privateKeyPath; // Path to user's private key
+	private $publicShareKeyId;
+	private $recoveryKeyId;
+	private $isPublic;
+
+	/**
+	 * @param \OC_FilesystemView $view
+	 * @param $userId
+	 * @param bool $client
+	 */
+	public function __construct(\OC_FilesystemView $view, $userId, $client = false) {
 
-	public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
-	
 		$this->view = $view;
 		$this->userId = $userId;
 		$this->client = $client;
-		$this->userDir =  '/' . $this->userId;
-		$this->userFilesDir =  '/' . $this->userId . '/' . 'files';
-		$this->publicKeyDir =  '/' . 'public-keys';
-		$this->encryptionDir =  '/' . $this->userId . '/' . 'files_encryption';
-		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
-		$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
-		$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
-		$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-		
+		$this->isPublic = false;
+
+		$this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+		$this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+		// if we are anonymous/public
+		if (\OCA\Encryption\Helper::isPublicAccess()) {
+			$this->userId = $this->publicShareKeyId;
+
+			// only handle for files_sharing app
+			if (isset($GLOBALS['app']) && $GLOBALS['app'] === 'files_sharing') {
+				$this->userDir = '/' . $GLOBALS['fileOwner'];
+				$this->fileFolderName = 'files';
+				$this->userFilesDir = '/' . $GLOBALS['fileOwner'] . '/'
+									  . $this->fileFolderName; // TODO: Does this need to be user configurable?
+				$this->publicKeyDir = '/' . 'public-keys';
+				$this->encryptionDir = '/' . $GLOBALS['fileOwner'] . '/' . 'files_encryption';
+				$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+				$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+				$this->publicKeyPath =
+					$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+				$this->privateKeyPath =
+					'/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+				$this->isPublic = true;
+			}
+
+		} else {
+			$this->userDir = '/' . $this->userId;
+			$this->fileFolderName = 'files';
+			$this->userFilesDir =
+				'/' . $this->userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
+			$this->publicKeyDir = '/' . 'public-keys';
+			$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+			$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+			$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+			$this->publicKeyPath =
+				$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+			$this->privateKeyPath =
+				$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+		}
 	}
-	
+
+	/**
+	 * @return bool
+	 */
 	public function ready() {
-		
-		if( 
-		!$this->view->file_exists( $this->encryptionDir )
-		or !$this->view->file_exists( $this->keyfilesPath )
-		or !$this->view->file_exists( $this->shareKeysPath )
-		or !$this->view->file_exists( $this->publicKeyPath )
-		or !$this->view->file_exists( $this->privateKeyPath ) 
+
+		if (
+			!$this->view->file_exists($this->encryptionDir)
+			or !$this->view->file_exists($this->keyfilesPath)
+			or !$this->view->file_exists($this->shareKeysPath)
+			or !$this->view->file_exists($this->publicKeyPath)
+			or !$this->view->file_exists($this->privateKeyPath)
 		) {
-		
+
 			return false;
-			
+
 		} else {
-		
+
 			return true;
-			
+
 		}
-	
+
 	}
-	
-        /**
-         * @brief Sets up user folders and keys for serverside encryption
-         * @param $passphrase passphrase to encrypt server-stored private key with
-         */
-	public function setupServerSide( $passphrase = null ) {
-		
-		// Create user dir
-		if( !$this->view->file_exists( $this->userDir ) ) {
-		
-			$this->view->mkdir( $this->userDir );
-		
-		}
-		
-		// Create user files dir
-		if( !$this->view->file_exists( $this->userFilesDir ) ) {
-		
-			$this->view->mkdir( $this->userFilesDir );
-		
-		}
-		
-		// Create shared public key directory
-		if( !$this->view->file_exists( $this->publicKeyDir ) ) {
-		
-			$this->view->mkdir( $this->publicKeyDir );
-		
-		}
-		
-		// Create encryption app directory
-		if( !$this->view->file_exists( $this->encryptionDir ) ) {
-		
-			$this->view->mkdir( $this->encryptionDir );
-		
-		}
-		
-		// Create mirrored keyfile directory
-		if( !$this->view->file_exists( $this->keyfilesPath ) ) {
-		
-			$this->view->mkdir( $this->keyfilesPath );
-		
-		}
-
-		// Create mirrored share env keys directory
-		if( !$this->view->file_exists( $this->shareKeysPath ) ) {
-		
-			$this->view->mkdir( $this->shareKeysPath );
-		
-		}
-		
+
+	/**
+	 * @brief Sets up user folders and keys for serverside encryption
+	 *
+	 * @param string $passphrase to encrypt server-stored private key with
+	 * @return bool
+	 */
+	public function setupServerSide($passphrase = null) {
+
+		// Set directories to check / create
+		$setUpDirs = array(
+			$this->userDir,
+			$this->userFilesDir,
+			$this->publicKeyDir,
+			$this->encryptionDir,
+			$this->keyfilesPath,
+			$this->shareKeysPath
+		);
+
+		// Check / create all necessary dirs
+		foreach ($setUpDirs as $dirPath) {
+
+			if (!$this->view->file_exists($dirPath)) {
+
+				$this->view->mkdir($dirPath);
+
+			}
+
+		}
+
 		// Create user keypair
-		if ( 
-			! $this->view->file_exists( $this->publicKeyPath ) 
-			or ! $this->view->file_exists( $this->privateKeyPath ) 
+		// we should never override a keyfile
+		if (
+			!$this->view->file_exists($this->publicKeyPath)
+			&& !$this->view->file_exists($this->privateKeyPath)
 		) {
-		
+
 			// Generate keypair
 			$keypair = Crypt::createKeypair();
-			
+
 			\OC_FileProxy::$enabled = false;
-			
+
 			// Save public key
-			$this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
-			
+			$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+
 			// Encrypt private key with user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
-			
+			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+
 			// Save private key
-			$this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
-			
+			$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+
 			\OC_FileProxy::$enabled = true;
-			
+
+		} else {
+			// check if public-key exists but private-key is missing
+			if ($this->view->file_exists($this->publicKeyPath) && !$this->view->file_exists($this->privateKeyPath)) {
+				\OCP\Util::writeLog('Encryption library',
+					'public key exists but private key is missing for "' . $this->userId . '"', \OCP\Util::FATAL);
+				return false;
+			} else {
+				if (!$this->view->file_exists($this->publicKeyPath) && $this->view->file_exists($this->privateKeyPath)
+				) {
+					\OCP\Util::writeLog('Encryption library',
+						'private key exists but public key is missing for "' . $this->userId . '"', \OCP\Util::FATAL);
+					return false;
+				}
+			}
+		}
+
+		// If there's no record for this user's encryption preferences
+		if (false === $this->recoveryEnabledForUser()) {
+
+			// create database configuration
+			$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
+			$args = array(
+				$this->userId,
+				'server-side',
+				0
+			);
+			$query = \OCP\DB::prepare($sql);
+			$query->execute($args);
+
 		}
-		
+
 		return true;
-	
+
 	}
-	
+
+	/**
+	 * @return string
+	 */
+	public function getPublicShareKeyId() {
+		return $this->publicShareKeyId;
+	}
+
+	/**
+	 * @brief Check whether pwd recovery is enabled for a given user
+	 * @return bool 1 = yes, 0 = no, false = no record
+	 *
+	 * @note If records are not being returned, check for a hidden space
+	 *       at the start of the uid in db
+	 */
+	public function recoveryEnabledForUser() {
+
+		$sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE  uid = ?';
+
+		$args = array($this->userId);
+
+		$query = \OCP\DB::prepare($sql);
+
+		$result = $query->execute($args);
+
+		$recoveryEnabled = array();
+
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+				if (isset($row['recovery_enabled'])) {
+					$recoveryEnabled[] = $row['recovery_enabled'];
+				}
+			}
+		}
+
+		// If no record is found
+		if (empty($recoveryEnabled)) {
+
+			return false;
+
+			// If a record is found
+		} else {
+
+			return $recoveryEnabled[0];
+
+		}
+
+	}
+
+	/**
+	 * @brief Enable / disable pwd recovery for a given user
+	 * @param bool $enabled Whether to enable or disable recovery
+	 * @return bool
+	 */
+	public function setRecoveryForUser($enabled) {
+
+		$recoveryStatus = $this->recoveryEnabledForUser();
+
+		// If a record for this user already exists, update it
+		if (false === $recoveryStatus) {
+
+			$sql = 'INSERT INTO `*PREFIX*encryption` (`uid`,`mode`,`recovery_enabled`) VALUES (?,?,?)';
+
+			$args = array(
+				$this->userId,
+				'server-side',
+				$enabled
+			);
+
+			// Create a new record instead
+		} else {
+
+			$sql = 'UPDATE `*PREFIX*encryption` SET recovery_enabled = ? WHERE uid = ?';
+
+			$args = array(
+				$enabled,
+				$this->userId
+			);
+
+		}
+
+		$query = \OCP\DB::prepare($sql);
+
+		if ($query->execute($args)) {
+
+			return true;
+
+		} else {
+
+			return false;
+
+		}
+
+	}
+
 	/**
 	 * @brief Find all files and their encryption status within a directory
 	 * @param string $directory The path of the parent directory to search
+	 * @param bool $found the founded files if called again
 	 * @return mixed false if 0 found, array on success. Keys: name, path
-	 
 	 * @note $directory needs to be a path relative to OC data dir. e.g.
 	 *       /admin/files NOT /backup OR /home/www/oc/data/admin/files
 	 */
-	public function findFiles( $directory ) {
-		
+	public function findEncFiles($directory, &$found = false) {
+
 		// Disable proxy - we don't want files to be decrypted before
 		// we handle them
 		\OC_FileProxy::$enabled = false;
-		
-		$found = array( 'plain' => array(), 'encrypted' => array(), 'legacy' => array() );
-		
-		if ( 
-			$this->view->is_dir( $directory ) 
-			&& $handle = $this->view->opendir( $directory ) 
+
+		if ($found === false) {
+			$found = array(
+				'plain' => array(),
+				'encrypted' => array(),
+				'legacy' => array()
+			);
+		}
+
+		if (
+			$this->view->is_dir($directory)
+			&& $handle = $this->view->opendir($directory)
 		) {
-		
-			while ( false !== ( $file = readdir( $handle ) ) ) {
-				
+
+			while (false !== ($file = readdir($handle))) {
+
 				if (
-				$file != "." 
-				&& $file != ".."
+					$file !== "."
+					&& $file !== ".."
 				) {
-					
-					$filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
-					$relPath = $this->stripUserFilesPath( $filePath );
-					
+
+					$filePath = $directory . '/' . $this->view->getRelativePath('/' . $file);
+					$relPath = \OCA\Encryption\Helper::stripUserFilesPath($filePath);
+
 					// If the path is a directory, search 
 					// its contents
-					if ( $this->view->is_dir( $filePath ) ) { 
-						
-						$this->findFiles( $filePath );
-					
-					// If the path is a file, determine 
-					// its encryption status
-					} elseif ( $this->view->is_file( $filePath ) ) {
-						
+					if ($this->view->is_dir($filePath)) {
+
+						$this->findEncFiles($filePath, $found);
+
+						// If the path is a file, determine
+						// its encryption status
+					} elseif ($this->view->is_file($filePath)) {
+
 						// Disable proxies again, some-
 						// where they got re-enabled :/
 						\OC_FileProxy::$enabled = false;
-						
-						$data = $this->view->file_get_contents( $filePath );
-						
+
+						$data = $this->view->file_get_contents($filePath);
+
 						// If the file is encrypted
 						// NOTE: If the userId is 
 						// empty or not set, file will 
@@ -270,207 +430,1118 @@ class Util {
 						// NOTE: This is inefficient;
 						// scanning every file like this
 						// will eat server resources :(
-						if ( 
-							Keymanager::getFileKey( $this->view, $this->userId, $file ) 
-							&& Crypt::isCatfile( $data )
+						if (
+							Keymanager::getFileKey($this->view, $this->userId, $relPath)
+							&& Crypt::isCatfileContent($data)
 						) {
-						
-							$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
-						
-						// If the file uses old 
-						// encryption system
-						} elseif (  Crypt::isLegacyEncryptedContent( $this->view->file_get_contents( $filePath ), $relPath ) ) {
-							
-							$found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
-							
-						// If the file is not encrypted
+
+							$found['encrypted'][] = array(
+								'name' => $file,
+								'path' => $filePath
+							);
+
+							// If the file uses old
+							// encryption system
+						} elseif ( Crypt::isLegacyEncryptedContent( $data, $relPath ) ) {
+
+							$found['legacy'][] = array(
+								'name' => $file,
+								'path' => $filePath
+							);
+
+							// If the file is not encrypted
 						} else {
-						
-							$found['plain'][] = array( 'name' => $file, 'path' => $filePath );
-						
+
+							$found['plain'][] = array(
+								'name' => $file,
+								'path' => $relPath
+							);
+
 						}
-					
+
 					}
-					
+
 				}
-				
+
 			}
-			
+
 			\OC_FileProxy::$enabled = true;
-			
-			if ( empty( $found ) ) {
-			
+
+			if (empty($found)) {
+
 				return false;
-			
+
 			} else {
-				
+
 				return $found;
-			
+
 			}
-		
+
 		}
-		
+
 		\OC_FileProxy::$enabled = true;
-		
+
 		return false;
 
 	}
-	
-        /**
-         * @brief Check if a given path identifies an encrypted file
-         * @return true / false
-         */
-	public function isEncryptedPath( $path ) {
-	
-		// Disable encryption proxy so data retreived is in its 
-		// original form
-		\OC_FileProxy::$enabled = false;
-	
-		$data = $this->view->file_get_contents( $path );
-		
-		\OC_FileProxy::$enabled = true;
-		
-		return Crypt::isCatfile( $data );
-	
-	}
-	
+
 	/**
-	 * @brief Format a path to be relative to the /user/files/ directory
+	 * @brief Fetch the last lines of a file efficiently
+	 * @note Safe to use on large files; does not read entire file to memory
+	 * @note Derivative of http://tekkie.flashbit.net/php/tail-functionality-in-php
 	 */
-	public function stripUserFilesPath( $path ) {
-	
-		$trimmed = ltrim( $path, '/' );
-		$split = explode( '/', $trimmed );
-		$sliced = array_slice( $split, 2 );
-		$relPath = implode( '/', $sliced );
-		
-		return $relPath;
-	
+	public function tail($filename, $numLines) {
+
+		\OC_FileProxy::$enabled = false;
+
+		$text = '';
+		$pos = -1;
+		$handle = $this->view->fopen($filename, 'r');
+
+		while ($numLines > 0) {
+
+			--$pos;
+
+			if (fseek($handle, $pos, SEEK_END) !== 0) {
+
+				rewind($handle);
+				$numLines = 0;
+
+			} elseif (fgetc($handle) === "\n") {
+
+				--$numLines;
+
+			}
+
+			$block_size = (-$pos) % 8192;
+			if ($block_size === 0 || $numLines === 0) {
+
+				$text = fread($handle, ($block_size === 0 ? 8192 : $block_size)) . $text;
+
+			}
+		}
+
+		fclose($handle);
+
+		\OC_FileProxy::$enabled = true;
+
+		return $text;
 	}
-	
+
 	/**
-	 * @brief Encrypt all files in a directory
-	 * @param string $publicKey the public key to encrypt files with
-	 * @param string $dirPath the directory whose files will be encrypted
-	 * @note Encryption is recursive
+	 * @brief Check if a given path identifies an encrypted file
+	 * @param string $path
+	 * @return boolean
 	 */
-	public function encryptAll( $publicKey, $dirPath, $legacyPassphrase = null, $newPassphrase = null ) {
-	
-		if ( $found = $this->findFiles( $dirPath ) ) {
-		
-			// Disable proxy to prevent file being encrypted twice
-			\OC_FileProxy::$enabled = false;
-		
-			// Encrypt unencrypted files
-			foreach ( $found['plain'] as $plainFile ) {
-				
-				// Fetch data from file
-				$plainData = $this->view->file_get_contents( $plainFile['path'] );
-				
-				// Encrypt data, generate catfile
-				$encrypted = Crypt::keyEncryptKeyfile( $plainData, $publicKey );
-				
-				$relPath = $this->stripUserFilesPath( $plainFile['path'] );
-				
-				// Save keyfile
-				Keymanager::setFileKey( $this->view, $relPath, $this->userId, $encrypted['key'] );
-				
-				// Overwrite the existing file with the encrypted one
-				$this->view->file_put_contents( $plainFile['path'], $encrypted['data'] );
-				
-				$size = strlen( $encrypted['data'] );
-				
-				// Add the file to the cache
-				\OC\Files\Filesystem::putFileInfo( $plainFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-			
-			}
-			
-			// Encrypt legacy encrypted files
-			if ( 
-				! empty( $legacyPassphrase ) 
-				&& ! empty( $newPassphrase ) 
-			) {
-			
-				foreach ( $found['legacy'] as $legacyFile ) {
-				
-					// Fetch data from file
-					$legacyData = $this->view->file_get_contents( $legacyFile['path'] );
-				
-					// Recrypt data, generate catfile
-					$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase );
-					
-					$relPath = $this->stripUserFilesPath( $legacyFile['path'] );
-					
-					// Save keyfile
-					Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['key'] );
-					
-					// Overwrite the existing file with the encrypted one
-					$this->view->file_put_contents( $legacyFile['path'], $recrypted['data'] );
-					
-					$size = strlen( $recrypted['data'] );
-					
-					// Add the file to the cache
-					\OC\Files\Filesystem::putFileInfo( $legacyFile['path'], array( 'encrypted'=>true, 'size' => $size ), '' );
-				
-				}
-				
-			}
-			
-			\OC_FileProxy::$enabled = true;
-			
-			// If files were found, return true
-			return true;
-		
-		} else {
-		
-			// If no files were found, return false
-			return false;
-			
+	public function isEncryptedPath($path) {
+
+		// Disable encryption proxy so data retrieved is in its
+		// original form
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// we only need 24 byte from the last chunk
+		$data = '';
+		$handle = $this->view->fopen($path, 'r');
+		if (is_resource($handle) && !fseek($handle, -24, SEEK_END)) {
+			$data = fgets($handle);
 		}
-		
+
+		// re-enable proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return Crypt::isCatfileContent($data);
+
 	}
-	
+
 	/**
-	 * @brief Return important encryption related paths
-	 * @param string $pathName Name of the directory to return the path of
-	 * @return string path
+	 * @brief get the file size of the unencrypted file
+	 * @param string $path absolute path
+	 * @return bool
 	 */
-	public function getPath( $pathName ) {
-	
-		switch ( $pathName ) {
-			
-			case 'publicKeyDir':
-			
+	public function getFileSize($path) {
+
+		$result = 0;
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// split the path parts
+		$pathParts = explode('/', $path);
+
+		// get relative path
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($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);
+			$size = filesize($fullPath);
+
+			// calculate last chunk nr
+			$lastChunkNr = floor($size / 8192);
+
+			// open stream
+			$stream = fopen('crypt://' . $relativePath, "r");
+
+			if (is_resource($stream)) {
+				// calculate last chunk position
+				$lastChunckPos = ($lastChunkNr * 8192);
+
+				// seek to end
+				fseek($stream, $lastChunckPos);
+
+				// get the content of the last chunk
+				$lastChunkContent = fread($stream, 8192);
+
+				// calc the real file size with the size of the last chunk
+				$realSize = (($lastChunkNr * 6126) + strlen($lastChunkContent));
+
+				// store file size
+				$result = $realSize;
+			}
+		}
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
+	}
+
+	/**
+	 * @brief fix the file size of the encrypted file
+	 * @param string $path absolute path
+	 * @return boolean true / false if file is encrypted
+	 */
+	public function fixFileSize($path) {
+
+		$result = false;
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$realSize = $this->getFileSize($path);
+
+		if ($realSize > 0) {
+
+			$cached = $this->view->getFileInfo($path);
+			$cached['encrypted'] = true;
+
+			// set the size
+			$cached['unencrypted_size'] = $realSize;
+
+			// put file info
+			$this->view->putFileInfo($path, $cached);
+
+			$result = true;
+
+		}
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return $result;
+	}
+
+	
+	/**
+	 * @param $path
+	 * @return bool
+	 */
+	public function isSharedPath($path) {
+
+		$trimmed = ltrim($path, '/');
+		$split = explode('/', $trimmed);
+
+		if (isset($split[2]) && $split[2] === 'Shared') {
+
+			return true;
+
+		} else {
+
+			return false;
+
+		}
+
+	}
+
+	/**
+	 * @brief Encrypt all files in a directory
+	 * @param string $dirPath the directory whose files will be encrypted
+	 * @param null $legacyPassphrase
+	 * @param null $newPassphrase
+	 * @return bool
+	 * @note Encryption is recursive
+	 */
+	public function encryptAll($dirPath, $legacyPassphrase = null, $newPassphrase = null) {
+
+		if ($found = $this->findEncFiles($dirPath)) {
+
+			// Disable proxy to prevent file being encrypted twice
+			\OC_FileProxy::$enabled = false;
+
+			// Encrypt unencrypted files
+			foreach ($found['plain'] as $plainFile) {
+
+				//relative to data/<user>/file
+				$relPath = $plainFile['path'];
+
+				//relative to /data
+				$rawPath = '/'.$this->userId . '/files/' . $plainFile['path'];
+
+				// Open plain file handle for binary reading
+				$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' );
+
+				// Move plain file to a temporary location
+				$size = stream_copy_to_stream( $plainHandle, $encHandle );
+
+				fclose($encHandle);
+
+				$fakeRoot = $this->view->getRoot();
+				$this->view->chroot('/'.$this->userId.'/files');
+
+				$this->view->rename($relPath . '.tmp', $relPath);
+
+				$this->view->chroot($fakeRoot);
+
+				// Add the file to the cache
+				\OC\Files\Filesystem::putFileInfo( $relPath, array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
+			}
+
+			// Encrypt legacy encrypted files
+			if (
+				!empty($legacyPassphrase)
+				&& !empty($newPassphrase)
+			) {
+
+				foreach ($found['legacy'] as $legacyFile) {
+
+					// 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 );
+
+					$rawPath = $legacyFile['path'];
+					$relPath = \OCA\Encryption\Helper::stripUserFilesPath($rawPath);
+
+					// Save keyfile
+					Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
+
+					// Save sharekeys to user folders
+					Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
+
+					// Overwrite the existing file with the encrypted one
+					$this->view->file_put_contents($rawPath, $recrypted['data']);
+
+					$size = strlen($recrypted['data']);
+
+					// Add the file to the cache
+					\OC\Files\Filesystem::putFileInfo($rawPath, array(
+																	 'encrypted' => true,
+																	 'size' => $size
+																), '');
+				}
+			}
+
+			\OC_FileProxy::$enabled = true;
+
+			// If files were found, return true
+			return true;
+		} else {
+
+			// If no files were found, return false
+			return false;
+		}
+	}
+
+	/**
+	 * @brief Return important encryption related paths
+	 * @param string $pathName Name of the directory to return the path of
+	 * @return string path
+	 */
+	public function getPath($pathName) {
+
+		switch ($pathName) {
+
+			case 'publicKeyDir':
+
 				return $this->publicKeyDir;
-				
+
 				break;
-				
+
 			case 'encryptionDir':
-			
+
 				return $this->encryptionDir;
-				
+
 				break;
-				
+
 			case 'keyfilesPath':
-			
+
 				return $this->keyfilesPath;
-				
+
 				break;
-				
+
 			case 'publicKeyPath':
-			
+
 				return $this->publicKeyPath;
-				
+
 				break;
-				
+
 			case 'privateKeyPath':
-			
+
 				return $this->privateKeyPath;
-				
+
 				break;
-			
 		}
-		
+
+		return false;
+
+	}
+
+	/**
+	 * @brief get path of a file.
+	 * @param int $fileId id of the file
+	 * @return string path of the file
+	 */
+	public static function fileIdToPath($fileId) {
+
+		$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+
+		$query = \OCP\DB::prepare($sql);
+
+		$result = $query->execute(array($fileId));
+
+		$path = false;
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+				$path = substr($row['path'], strlen('files'));
+			}
+		}
+
+		return $path;
+
+	}
+
+	/**
+	 * @brief Filter an array of UIDs to return only ones ready for sharing
+	 * @param array $unfilteredUsers users to be checked for sharing readiness
+	 * @return array as multi-dimensional array. keys: ready, unready
+	 */
+	public function filterShareReadyUsers($unfilteredUsers) {
+
+		// This array will collect the filtered IDs
+		$readyIds = $unreadyIds = array();
+
+		// Loop through users and create array of UIDs that need new keyfiles
+		foreach ($unfilteredUsers as $user) {
+
+			$util = new Util($this->view, $user);
+
+			// Check that the user is encryption capable, or is the
+			// public system user 'ownCloud' (for public shares)
+			if (
+				$user === $this->publicShareKeyId
+				or $user === $this->recoveryKeyId
+				or $util->ready()
+			) {
+
+				// Construct array of ready UIDs for Keymanager{}
+				$readyIds[] = $user;
+
+			} else {
+
+				// Construct array of unready UIDs for Keymanager{}
+				$unreadyIds[] = $user;
+
+				// Log warning; we can't do necessary setup here
+				// because we don't have the user passphrase
+				\OCP\Util::writeLog('Encryption library',
+					'"' . $user . '" is not setup for encryption', \OCP\Util::WARN);
+
+			}
+
+		}
+
+		return array(
+			'ready' => $readyIds,
+			'unready' => $unreadyIds
+		);
+
+	}
+
+	/**
+	 * @brief Decrypt a keyfile without knowing how it was encrypted
+	 * @param string $filePath
+	 * @param string $fileOwner
+	 * @param string $privateKey
+	 * @return bool|string
+	 * @note Checks whether file was encrypted with openssl_seal or
+	 *       openssl_encrypt, and decrypts accrdingly
+	 * @note This was used when 2 types of encryption for keyfiles was used,
+	 *       but now we've switched to exclusively using openssl_seal()
+	 */
+	public function decryptUnknownKeyfile($filePath, $fileOwner, $privateKey) {
+
+		// Get the encrypted keyfile
+		// NOTE: the keyfile format depends on how it was encrypted! At
+		// this stage we don't know how it was encrypted
+		$encKeyfile = Keymanager::getFileKey($this->view, $this->userId, $filePath);
+
+		// We need to decrypt the keyfile
+		// Has the file been shared yet?
+		if (
+			$this->userId === $fileOwner
+			&& !Keymanager::getShareKey($this->view, $this->userId, $filePath) // NOTE: we can't use isShared() here because it's a post share hook so it always returns true
+		) {
+
+			// The file has no shareKey, and its keyfile must be 
+			// decrypted conventionally
+			$plainKeyfile = Crypt::keyDecrypt($encKeyfile, $privateKey);
+
+
+		} else {
+
+			// The file has a shareKey and must use it for decryption
+			$shareKey = Keymanager::getShareKey($this->view, $this->userId, $filePath);
+
+			$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+		}
+
+		return $plainKeyfile;
+
+	}
+
+	/**
+	 * @brief Encrypt keyfile to multiple users
+	 * @param Session $session
+	 * @param array $users list of users which should be able to access the file
+	 * @param string $filePath path of the file to be shared
+	 * @return bool
+	 */
+	public function setSharedFileKeyfiles(Session $session, array $users, $filePath) {
+
+		// Make sure users are capable of sharing
+		$filteredUids = $this->filterShareReadyUsers($users);
+
+		// If we're attempting to share to unready users
+		if (!empty($filteredUids['unready'])) {
+
+			\OCP\Util::writeLog('Encryption library',
+				'Sharing to these user(s) failed as they are unready for encryption:"'
+				. print_r($filteredUids['unready'], 1), \OCP\Util::WARN);
+
+			return false;
+
+		}
+
+		// Get public keys for each user, ready for generating sharekeys
+		$userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+
+		// Note proxy status then disable it
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// Get the current users's private key for decrypting existing keyfile
+		$privateKey = $session->getPrivateKey();
+
+		$fileOwner = \OC\Files\Filesystem::getOwner($filePath);
+
+		// Decrypt keyfile
+		$plainKeyfile = $this->decryptUnknownKeyfile($filePath, $fileOwner, $privateKey);
+
+		// Re-enc keyfile to (additional) sharekeys
+		$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+
+		// Save the recrypted key to it's owner's keyfiles directory
+		// Save new sharekeys to all necessary user directory
+		if (
+			!Keymanager::setFileKey($this->view, $filePath, $fileOwner, $multiEncKey['data'])
+			|| !Keymanager::setShareKeys($this->view, $filePath, $multiEncKey['keys'])
+		) {
+
+			\OCP\Util::writeLog('Encryption library',
+				'Keyfiles could not be saved for users sharing ' . $filePath, \OCP\Util::ERROR);
+
+			return false;
+
+		}
+
+		// Return proxy to original status
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return true;
+	}
+
+	/**
+	 * @brief Find, sanitise and format users sharing a file
+	 * @note This wraps other methods into a portable bundle
+	 */
+	public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) {
+
+		// Check if key recovery is enabled
+		if (
+			\OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')
+			&& $this->recoveryEnabledForUser()
+		) {
+
+			$recoveryEnabled = true;
+
+		} else {
+
+			$recoveryEnabled = false;
+
+		}
+
+		// Make sure that a share key is generated for the owner too
+		list($owner, $ownerPath) = $this->getUidAndFilename($filePath);
+
+		$userIds = array();
+		if ($sharingEnabled) {
+
+			// Find out who, if anyone, is sharing the file
+			$result = \OCP\Share::getUsersSharingFile($ownerPath, $owner, true);
+			$userIds = $result['users'];
+			if ($result['public']) {
+				$userIds[] = $this->publicShareKeyId;
+			}
+
+		}
+
+		// If recovery is enabled, add the 
+		// Admin UID to list of users to share to
+		if ($recoveryEnabled) {
+
+			// Find recoveryAdmin user ID
+			$recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
+
+			// Add recoveryAdmin to list of users sharing
+			$userIds[] = $recoveryKeyId;
+
+		}
+
+		// add current user if given
+		if ($currentUserId !== false) {
+
+			$userIds[] = $currentUserId;
+
+		}
+
+		// Remove duplicate UIDs
+		$uniqueUserIds = array_unique($userIds);
+
+		return $uniqueUserIds;
+
+	}
+
+	/**
+	 * @brief Set file migration status for user
+	 * @param $status
+	 * @return bool
+	 */
+	public function setMigrationStatus($status) {
+
+		$sql = 'UPDATE `*PREFIX*encryption` SET migration_status = ? WHERE uid = ?';
+
+		$args = array(
+			$status,
+			$this->userId
+		);
+
+		$query = \OCP\DB::prepare($sql);
+
+		if ($query->execute($args)) {
+
+			return true;
+
+		} else {
+
+			return false;
+
+		}
+
+	}
+
+	/**
+	 * @brief Check whether pwd recovery is enabled for a given user
+	 * @return bool 1 = yes, 0 = no, false = 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 = ?';
+
+		$args = array($this->userId);
+
+		$query = \OCP\DB::prepare($sql);
+
+		$result = $query->execute($args);
+
+		$migrationStatus = array();
+
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+				if (isset($row['migration_status'])) {
+					$migrationStatus[] = $row['migration_status'];
+				}
+			}
+		}
+
+		// If no record is found
+		if (empty($migrationStatus)) {
+
+			return false;
+
+			// If a record is found
+		} else {
+
+			return $migrationStatus[0];
+
+		}
+
+	}
+
+	/**
+	 * @brief get uid of the owners of the file and the path to the file
+	 * @param string $path Path of the file to check
+	 * @throws \Exception
+	 * @note $shareFilePath must be relative to data/UID/files. Files
+	 *       relative to /Shared are also acceptable
+	 * @return array
+	 */
+	public function getUidAndFilename($path) {
+
+		$view = new \OC\Files\View($this->userFilesDir);
+		$fileOwnerUid = $view->getOwner($path);
+
+		// handle public access
+		if ($this->isPublic) {
+			$filename = $path;
+			$fileOwnerUid = $GLOBALS['fileOwner'];
+
+			return array(
+				$fileOwnerUid,
+				$filename
+			);
+		} else {
+
+			// Check that UID is valid
+			if (!\OCP\User::userExists($fileOwnerUid)) {
+				throw new \Exception(
+					'Could not find owner (UID = "' . var_export($fileOwnerUid, 1) . '") of file "' . $path . '"');
+			}
+
+			// NOTE: Bah, this dependency should be elsewhere
+			\OC\Files\Filesystem::initMountPoints($fileOwnerUid);
+
+			// If the file owner is the currently logged in user
+			if ($fileOwnerUid === $this->userId) {
+
+				// Assume the path supplied is correct
+				$filename = $path;
+
+			} else {
+
+				$info = $view->getFileInfo($path);
+				$ownerView = new \OC\Files\View('/' . $fileOwnerUid . '/files');
+
+				// Fetch real file path from DB
+				$filename = $ownerView->getPath($info['fileid']); // TODO: Check that this returns a path without including the user data dir
+
+			}
+
+			return array(
+				$fileOwnerUid,
+				$filename
+			);
+		}
+
+
+	}
+
+	/**
+	 * @brief go recursively through a dir and collect all files and sub files.
+	 * @param string $dir relative to the users files folder
+	 * @return array with list of files relative to the users files folder
+	 */
+	public function getAllFiles($dir) {
+
+		$result = array();
+
+		$content = $this->view->getDirectoryContent(\OC\Files\Filesystem::normalizePath($this->userFilesDir . '/' . $dir));
+
+		// handling for re shared folders
+		$pathSplit = explode('/', $dir);
+
+		foreach ($content as $c) {
+
+			$sharedPart = $pathSplit[sizeof($pathSplit) - 1];
+			$targetPathSplit = array_reverse(explode('/', $c['path']));
+
+			$path = '';
+
+			// rebuild path
+			foreach ($targetPathSplit as $pathPart) {
+
+				if ($pathPart !== $sharedPart) {
+
+					$path = '/' . $pathPart . $path;
+
+				} else {
+
+					break;
+
+				}
+
+			}
+
+			$path = $dir . $path;
+
+			if ($c['type'] === 'dir') {
+
+				$result = array_merge($result, $this->getAllFiles($path));
+
+			} else {
+
+				$result[] = $path;
+
+			}
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * @brief get shares parent.
+	 * @param int $id of the current share
+	 * @return array of the parent
+	 */
+	public static function getShareParent($id) {
+
+		$sql = 'SELECT `file_target`, `item_type` FROM `*PREFIX*share` WHERE `id` = ?';
+
+		$query = \OCP\DB::prepare($sql);
+
+		$result = $query->execute(array($id));
+
+		$row = array();
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+			}
+		}
+
+		return $row;
+
+	}
+
+	/**
+	 * @brief get shares parent.
+	 * @param int $id of the current share
+	 * @return array of the parent
+	 */
+	public static function getParentFromShare($id) {
+
+		$sql = 'SELECT `parent` FROM `*PREFIX*share` WHERE `id` = ?';
+
+		$query = \OCP\DB::prepare($sql);
+
+		$result = $query->execute(array($id));
+
+		$row = array();
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$row = $result->fetchRow();
+			}
+		}
+
+		return $row;
+
+	}
+
+	/**
+	 * @brief get owner of the shared files.
+	 * @param $id
+	 * @internal param int $Id of a share
+	 * @return string owner
+	 */
+	public function getOwnerFromSharedFile($id) {
+
+		$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+
+		$result = $query->execute(array($id));
+
+		$source = array();
+		if (\OCP\DB::isError($result)) {
+			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+		} else {
+			if($result->numRows() > 0) {
+				$source = $result->fetchRow();
+			}
+		}
+
+		$fileOwner = false;
+
+		if (isset($source['parent'])) {
+
+			$parent = $source['parent'];
+
+			while (isset($parent)) {
+
+				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+
+				$result = $query->execute(array($parent));
+
+				$item = array();
+				if (\OCP\DB::isError($result)) {
+					\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
+				} else {
+					if($result->numRows() > 0) {
+						$item = $result->fetchRow();
+					}
+				}
+
+				if (isset($item['parent'])) {
+
+					$parent = $item['parent'];
+
+				} else {
+
+					$fileOwner = $item['uid_owner'];
+
+					break;
+
+				}
+			}
+
+		} else {
+
+			$fileOwner = $source['uid_owner'];
+
+		}
+
+		return $fileOwner;
+
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserId() {
+		return $this->userId;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUserFilesDir() {
+		return $this->userFilesDir;
+	}
+
+	/**
+	 * @param $password
+	 * @return bool
+	 */
+	public function checkRecoveryPassword($password) {
+
+		$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);
+
+		$controlData = $this->view->file_get_contents($pathControlData);
+		$decryptedControlData = Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		if ($decryptedControlData === 'ownCloud') {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getRecoveryKeyId() {
+		return $this->recoveryKeyId;
+	}
+
+	/**
+	 * @brief add recovery key to all encrypted files
+	 */
+	public function addRecoveryKeys($path = '/') {
+		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		foreach ($dirContent as $item) {
+			// get relative path from files_encryption/keyfiles/
+			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+			if ($item['type'] === 'dir') {
+				$this->addRecoveryKeys($filePath . '/');
+			} else {
+				$session = new \OCA\Encryption\Session(new \OC_FilesystemView('/'));
+				$sharingEnabled = \OCP\Share::isEnabled();
+				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+				$file = substr($filePath, 0, -4);
+				$usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
+				$this->setSharedFileKeyfiles($session, $usersSharing, $file);
+			}
+		}
+	}
+
+	/**
+	 * @brief remove recovery key to all encrypted files
+	 */
+	public function removeRecoveryKeys($path = '/') {
+		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		foreach ($dirContent as $item) {
+			// get relative path from files_encryption/keyfiles
+			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+			if ($item['type'] === 'dir') {
+				$this->removeRecoveryKeys($filePath . '/');
+			} else {
+				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+				$file = substr($filePath, 0, -4);
+				$this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
+			}
+		}
+	}
+
+	/**
+	 * @brief decrypt given file with recovery key and encrypt it again to the owner and his new key
+	 * @param string $file
+	 * @param string $privateKey recovery key to decrypt the file
+	 */
+	private function recoverFile($file, $privateKey) {
+
+		$sharingEnabled = \OCP\Share::isEnabled();
+
+		// Find out who, if anyone, is sharing the file
+		if ($sharingEnabled) {
+			$result = \OCP\Share::getUsersSharingFile($file, $this->userId, true);
+			$userIds = $result['users'];
+			$userIds[] = $this->recoveryKeyId;
+			if ($result['public']) {
+				$userIds[] = $this->publicShareKeyId;
+			}
+		} else {
+			$userIds = array(
+				$this->userId,
+				$this->recoveryKeyId
+			);
+		}
+		$filteredUids = $this->filterShareReadyUsers($userIds);
+
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		//decrypt file key
+		$encKeyfile = $this->view->file_get_contents($this->keyfilesPath . $file . ".key");
+		$shareKey = $this->view->file_get_contents(
+			$this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey");
+		$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+		// encrypt file key again to all users, this time with the new public key for the recovered use
+		$userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
+		$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
+
+		// write new keys to filesystem TDOO!
+		$this->view->file_put_contents($this->keyfilesPath . $file . '.key', $multiEncKey['data']);
+		foreach ($multiEncKey['keys'] as $userId => $shareKey) {
+			$shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
+			$this->view->file_put_contents($shareKeyPath, $shareKey);
+		}
+
+		// Return proxy to original status
+		\OC_FileProxy::$enabled = $proxyStatus;
+	}
+
+	/**
+	 * @brief collect all files and recover them one by one
+	 * @param string $path to look for files keys
+	 * @param string $privateKey private recovery key which is used to decrypt the files
+	 */
+	private function recoverAllFiles($path, $privateKey) {
+		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		foreach ($dirContent as $item) {
+			// get relative path from files_encryption/keyfiles
+			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
+			if ($item['type'] === 'dir') {
+				$this->recoverAllFiles($filePath . '/', $privateKey);
+			} else {
+				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
+				$file = substr($filePath, 0, -4);
+				$this->recoverFile($file, $privateKey);
+			}
+		}
+	}
+
+	/**
+	 * @brief recover users files in case of password lost
+	 * @param string $recoveryPassword
+	 */
+	public function recoverUsersFiles($recoveryPassword) {
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$encryptedKey = $this->view->file_get_contents(
+			'/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
+		$privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $recoveryPassword);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		$this->recoverAllFiles('/', $privateKey);
+	}
+
+	/**
+	 * Get the path including the storage mount point
+	 * @param int $id
+	 * @return string the path including the mount point like AmazonS3/folder/file.txt
+	 */
+	public function getPathWithMountPoint($id) {
+		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);
+
+		// reformat the path to be relative e.g. /user/files/folder becomes /folder/
+		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
+
+		return $relativePath;
 	}
 
 }
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..5367605898262f3d66b0e83a5aa9c06859fa8182
--- /dev/null
+++ b/apps/files_encryption/settings-admin.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+\OC_Util::checkAdminUser();
+
+$tmpl = new OCP\Template('files_encryption', 'settings-admin');
+
+// Check if an adminRecovery account is enabled for recovering files after lost pwd
+$view = new OC_FilesystemView('');
+
+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+
+$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
+
+\OCP\Util::addscript('files_encryption', 'settings-admin');
+\OCP\Util::addscript('core', 'multiselect');
+
+return $tmpl->fetchPage();
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index af0273cfdc4dc4cf1a5c31f6155ff158c8b04d5b..3e96565949b95f3cd09ef29ae1703fa3b8bab76b 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -6,12 +6,23 @@
  * See the COPYING-README file.
  */
 
-$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
+// Add CSS stylesheet
+\OC_Util::addStyle('files_encryption', 'settings-personal');
 
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+$tmpl = new OCP\Template('files_encryption', 'settings-personal');
 
-$tmpl->assign( 'blacklist', $blackList );
+$user = \OCP\USER::getUser();
+$view = new \OC_FilesystemView('/');
+$util = new \OCA\Encryption\Util($view, $user);
+
+$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+\OCP\Util::addscript('files_encryption', 'settings-personal');
+\OCP\Util::addScript('settings', 'personal');
+
+$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
+$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
 
 return $tmpl->fetchPage();
 
-return null;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
deleted file mode 100644
index d1260f44e9f6ef98a6702f13a9fc3fd3a2a38073..0000000000000000000000000000000000000000
--- a/apps/files_encryption/settings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-\OC_Util::checkAdminUser();
-
-$tmpl = new OCP\Template( 'files_encryption', 'settings' );
-
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
-
-$tmpl->assign( 'blacklist', $blackList );
-$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
-
-\OCP\Util::addscript( 'files_encryption', 'settings' );
-\OCP\Util::addscript( 'core', 'multiselect' );
-
-return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..18fea1845f42189f9fce958377cd5984c5e1cccb
--- /dev/null
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -0,0 +1,56 @@
+<form id="encryption">
+	<fieldset class="personalblock">
+		
+		<p>
+			<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" )); ?>
+		</p>
+		<br /><br />
+		<p>
+			<strong><?php p($l->t( "Change encryption passwords recovery key:" )); ?></strong>
+			<br /><br />
+			<input 
+				type="password"
+				name="changeRecoveryPassword"
+				id="oldRecoveryPassword"
+				<?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
+			<label for="oldRecoveryPassword"><?php p($l->t( "Old Recovery account password" )); ?></label>
+			<br />
+			<input 
+				type="password"
+				name="changeRecoveryPassword"
+				id="newRecoveryPassword"
+				<?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
+			<label for="newRecoveryPassword"><?php p($l->t( "New Recovery account password" )); ?></label>
+			<br />
+			<button
+				type="button"
+				name="submitChangeRecoveryKey"
+				disabled><?php p($l->t( "Change Password" )); ?>
+			</button>
+			<span class="msg"></span>
+		</p>
+	</fieldset>
+</form>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 5f0accaed5fd960c3c6a2a08b3493f483148b841..04d6e79179ea219190ced54d76f0321ca096d1d2 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,22 +1,33 @@
 <form id="encryption">
 	<fieldset class="personalblock">
 		<legend>
-			<?php p($l->t( 'Encryption' )); ?>
+			<?php p( $l->t( 'Encryption' ) ); ?>
 		</legend>
-		<p>
-			<?php p($l->t( 'File encryption is enabled.' )); ?>
-		</p>
-		<?php if ( ! empty( $_["blacklist"] ) ): ?>
-		<p>
-			<?php p($l->t( 'The following file types will not be encrypted:' )); ?>
-		</p>
-		<ul>
-			<?php foreach( $_["blacklist"] as $type ): ?>
-			<li>
-				<?php p($type); ?>
-			</li>
-			<?php endforeach; ?>
-		</ul>
+		
+		<?php if ( $_["recoveryEnabled"] ): ?>
+			<p>
+				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with your administrator:" ) ); ?></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>
+				<br />
+				<input 
+				type='radio'
+				name='userEnableRecovery'
+				value='1'
+				<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />
+				<?php p( $l->t( "Enabled" ) ); ?>
+				<br />
+				
+				<input 
+				type='radio'
+				name='userEnableRecovery'
+				value='0'
+				<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />
+				<?php p( $l->t( "Disabled" ) ); ?>
+				<div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>
+				<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/templates/settings.php b/apps/files_encryption/templates/settings.php
deleted file mode 100644
index b873d7f5aafd8e081088de28b8ad009aabcc5a56..0000000000000000000000000000000000000000
--- a/apps/files_encryption/templates/settings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<form id="encryption">
-	<fieldset class="personalblock">
-		
-		<p>
-			<strong><?php p($l->t( 'Encryption' )); ?></strong>
-			
-			<?php p($l->t( "Exclude the following file types from encryption:" )); ?>
-			<br />
-			
-			<select 
-			id='encryption_blacklist' 
-			title="<?php p($l->t( 'None' ))?>" 
-			multiple="multiple">
-			<?php foreach($_["blacklist"] as $type): ?>
-				<option selected="selected" value="<?php p($type); ?>"> <?php p($type); ?> </option>
-			<?php endforeach;?>
-			</select>
-		</p>
-	</fieldset>
-</form>
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
deleted file mode 100755
index aa87ec328211bd936b922ae7ed3b0daa45594f68..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/crypt.php
+++ /dev/null
@@ -1,667 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
- * Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-use OCA\Encryption;
-
-// This has to go here because otherwise session errors arise, and the private 
-// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
-
-/**
- * @note It would be better to use Mockery here for mocking out the session 
- * handling process, and isolate calls to session class and data from the unit 
- * tests relating to them (stream etc.). However getting mockery to work and 
- * overload classes whilst also using the OC autoloader is difficult due to 
- * load order Pear errors.
- */
-
-class Test_Crypt extends \PHPUnit_Framework_TestCase {
-	
-	function setUp() {
-		
-		// set content for encrypting / decrypting in tests
-		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-		$this->dataShort = 'hats';
-		$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
-		$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
-		$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
-		$this->randomKey = Encryption\Crypt::generateKey();
-		
-		$keypair = Encryption\Crypt::createKeypair();
-		$this->genPublicKey =  $keypair['publicKey'];
-		$this->genPrivateKey = $keypair['privateKey'];
-		
-		$this->view = new \OC_FilesystemView( '/' );
-		
-		\OC_User::setUserId( 'admin' );
-		$this->userId = 'admin';
-		$this->pass = 'admin';
-		
-		\OC_Filesystem::init( '/' );
-		\OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-		
-	}
-	
-	function tearDown() {
-	
-	}
-
-	function testGenerateKey() {
-	
-		# TODO: use more accurate (larger) string length for test confirmation
-		
-		$key = Encryption\Crypt::generateKey();
-		
-		$this->assertTrue( strlen( $key ) > 16 );
-	
-	}
-	
-	function testGenerateIv() {
-		
-		$iv = Encryption\Crypt::generateIv();
-		
-		$this->assertEquals( 16, strlen( $iv ) );
-		
-		return $iv;
-	
-	}
-	
-	/**
-	 * @depends testGenerateIv
-	 */
-	function testConcatIv( $iv ) {
-		
-		$catFile = Encryption\Crypt::concatIv( $this->dataLong, $iv );
-		
-		// Fetch encryption metadata from end of file
-		$meta = substr( $catFile, -22 );
-		
-		$identifier = substr( $meta, 0, 6);
-		
-		// Fetch IV from end of file
-		$foundIv = substr( $meta, 6 );
-		
-		$this->assertEquals( '00iv00', $identifier );
-		
-		$this->assertEquals( $iv, $foundIv );
-		
-		// Remove IV and IV identifier text to expose encrypted content
-		$data = substr( $catFile, 0, -22 );
-		
-		$this->assertEquals( $this->dataLong, $data );
-		
-		return array(
-			'iv' => $iv
-			, 'catfile' => $catFile
-		);
-	
-	}
-	
-	/**
-	 * @depends testConcatIv
-	 */
-	function testSplitIv( $testConcatIv ) {
-		
-		// Split catfile into components
-		$splitCatfile = Encryption\Crypt::splitIv( $testConcatIv['catfile'] );
-		
-		// Check that original IV and split IV match
-		$this->assertEquals( $testConcatIv['iv'], $splitCatfile['iv'] );
-		
-		// Check that original data and split data match
-		$this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
-	
-	}
-	
-	function testAddPadding() {
-	
-		$padded = Encryption\Crypt::addPadding( $this->dataLong );
-		
-		$padding = substr( $padded, -2 );
-		
-		$this->assertEquals( 'xx' , $padding );
-		
-		return $padded;
-	
-	}
-	
-	/**
-	 * @depends testAddPadding
-	 */
-	function testRemovePadding( $padded ) {
-	
-		$noPadding = Encryption\Crypt::RemovePadding( $padded );
-		
-		$this->assertEquals( $this->dataLong, $noPadding );
-	
-	}
-	
-	function testEncrypt() {
-	
-		$random = openssl_random_pseudo_bytes( 13 );
-
-		$iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
-
-		$crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-
-		$this->assertNotEquals( $this->dataUrl, $crypted );
-	
-	}
-	
-	function testDecrypt() {
-	
-		$random = openssl_random_pseudo_bytes( 13 );
-
-		$iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
-
-		$crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
-	
-		$decrypt = Encryption\Crypt::decrypt( $crypted, $iv, 'hat' );
-
-		$this->assertEquals( $this->dataUrl, $decrypt );
-	
-	}
-	
-	function testSymmetricEncryptFileContent() {
-	
-		# TODO: search in keyfile for actual content as IV will ensure this test always passes
-		
-		$crypted = Encryption\Crypt::symmetricEncryptFileContent( $this->dataShort, 'hat' );
-
-		$this->assertNotEquals( $this->dataShort, $crypted );
-		
-
-		$decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted, 'hat' );
-
-		$this->assertEquals( $this->dataShort, $decrypt );
-		
-	}
-	
-	// These aren't used for now
-// 	function testSymmetricBlockEncryptShortFileContent() {
-// 		
-// 		$crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
-// 		
-// 		$this->assertNotEquals( $this->dataShort, $crypted );
-// 		
-// 
-// 		$decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-// 
-// 		$this->assertEquals( $this->dataShort, $decrypt );
-// 		
-// 	}
-// 	
-// 	function testSymmetricBlockEncryptLongFileContent() {
-// 		
-// 		$crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
-// 		
-// 		$this->assertNotEquals( $this->dataLong, $crypted );
-// 		
-// 
-// 		$decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-// 
-// 		$this->assertEquals( $this->dataLong, $decrypt );
-// 		
-// 	}
-	
-	function testSymmetricStreamEncryptShortFileContent() { 
-		
-		$filename = 'tmp-'.time();
-		
-		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-		
-		// Test that data was successfully written
-		$this->assertTrue( is_int( $cryptedFile ) );
-		
-		
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-		
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
-		
-		// Get private key
-		$encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-		
-		$decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-		
-		
-		// Get keyfile
-		$encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-		
-		$decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-		
-		
-		// Manually decrypt
-		$manualDecrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $retreivedCryptedFile, $decryptedKeyfile );
-		
-		// Check that decrypted data matches
-		$this->assertEquals( $this->dataShort, $manualDecrypt );
-		
-	}
-	
-	/**
-	 * @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 
-	 * reassembly of its data
-	 */
-	function testSymmetricStreamEncryptLongFileContent() {
-		
-		// Generate a a random filename
-		$filename = 'tmp-'.time();
-		
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
-		
-		// Test that data was successfully written
-		$this->assertTrue( is_int( $cryptedFile ) );
-		
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-		
-// 		echo "\n\n\$retreivedCryptedFile = $retreivedCryptedFile\n\n";
-		
-		// Check that the file was encrypted before being written to disk
-		$this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
-		
-		// Manuallly split saved file into separate IVs and encrypted chunks
-		$r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
-		
-		//print_r($r);
-		
-		// Join IVs and their respective data chunks
-		$e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
-		
-		//print_r($e);
-		
-		
-		// Get private key
-		$encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-		
-		$decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
-		
-		
-		// Get keyfile
-		$encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
-		
-		$decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
-		
-		
-		// Set var for reassembling decrypted content
-		$decrypt = '';
-		
-		// Manually decrypt chunk
-		foreach ($e as $e) {
-		
-// 			echo "\n\$e = $e";
-			
-			$chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $decryptedKeyfile );
-			
-			// Assemble decrypted chunks
-			$decrypt .= $chunkDecrypt;
-			
-// 			echo "\n\$chunkDecrypt = $chunkDecrypt";
-			
-		}
-		
-// 		echo "\n\$decrypt = $decrypt";
-		
-		$this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
-		
-		// Teardown
-		
-		$this->view->unlink( $filename );
-		
-		Encryption\Keymanager::deleteFileKey( $filename );
-		
-	}
-	
-	/**
-	 * @brief Test that data that is read by the crypto stream wrapper
-	 */
-	function testSymmetricStreamDecryptShortFileContent() {
-		
-		$filename = 'tmp-'.time();
-		
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
-		
-		// Test that data was successfully written
-		$this->assertTrue( is_int( $cryptedFile ) );
-		
-		
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-		
-		$decrypt = file_get_contents( 'crypt://' . $filename );
-		
-		$this->assertEquals( $this->dataShort, $decrypt );
-		
-	}
-	
-	function testSymmetricStreamDecryptLongFileContent() {
-		
-		$filename = 'tmp-'.time();
-		
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
-		
-		// Test that data was successfully written
-		$this->assertTrue( is_int( $cryptedFile ) );
-		
-		
-		// Get file contents without using any wrapper to get it's actual contents on disk
-		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
-		
-		$decrypt = file_get_contents( 'crypt://' . $filename );
-		
-		$this->assertEquals( $this->dataLong, $decrypt );
-		
-	}
-	
-	// Is this test still necessary?
-// 	function testSymmetricBlockStreamDecryptFileContent() {
-// 	
-// 		\OC_User::setUserId( 'admin' );
-// 		
-// 		// Disable encryption proxy to prevent unwanted en/decryption
-// 		\OC_FileProxy::$enabled = false;
-// 		
-// 		$cryptedFile = file_put_contents( 'crypt://' . '/blockEncrypt', $this->dataUrl );
-// 		
-// 		// Disable encryption proxy to prevent unwanted en/decryption
-// 		\OC_FileProxy::$enabled = false;
-// 		
-// 		echo "\n\n\$cryptedFile = " . $this->view->file_get_contents( '/blockEncrypt' );
-// 		
-// 		$retreivedCryptedFile = file_get_contents( 'crypt://' . '/blockEncrypt' );
-// 		
-// 		$this->assertEquals( $this->dataUrl, $retreivedCryptedFile );
-// 		
-// 		\OC_FileProxy::$enabled = false;
-// 		
-// 	}
-
-	function testSymmetricEncryptFileContentKeyfile() {
-	
-		# TODO: search in keyfile for actual content as IV will ensure this test always passes
-	
-		$crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-		
-		$this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-		
-		
-		$decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted['encrypted'], $crypted['key'] );
-		
-		$this->assertEquals( $this->dataUrl, $decrypt );
-	
-	}
-	
-	function testIsEncryptedContent() {
-		
-		$this->assertFalse( Encryption\Crypt::isCatfile( $this->dataUrl ) );
-		
-		$this->assertFalse( Encryption\Crypt::isCatfile( $this->legacyEncryptedData ) );
-		
-		$keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
-
-		$this->assertTrue( Encryption\Crypt::isCatfile( $keyfileContent ) );
-		
-	}
-	
-	function testMultiKeyEncrypt() {
-		
-		# TODO: search in keyfile for actual content as IV will ensure this test always passes
-		
-		$pair1 = Encryption\Crypt::createKeypair();
-		
-		$this->assertEquals( 2, count( $pair1 ) );
-		
-		$this->assertTrue( strlen( $pair1['publicKey'] ) > 1 );
-		
-		$this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
-		
-
-		$crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataUrl, array( $pair1['publicKey'] ) );
-		
-		$this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
-		
-
-		$decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['encrypted'], $crypted['keys'][0], $pair1['privateKey'] );
-		
- 		$this->assertEquals( $this->dataUrl, $decrypt );
-	
-	}
-	
-	function testKeyEncrypt() {
-		
-		// Generate keypair
-		$pair1 = Encryption\Crypt::createKeypair();
-		
-		// Encrypt data
-		$crypted = Encryption\Crypt::keyEncrypt( $this->dataUrl, $pair1['publicKey'] );
-		
-		$this->assertNotEquals( $this->dataUrl, $crypted );
-		
-		// Decrypt data
-		$decrypt = Encryption\Crypt::keyDecrypt( $crypted, $pair1['privateKey'] );
-		
-		$this->assertEquals( $this->dataUrl, $decrypt );
-	
-	}
-	
-	// What is the point of this test? It doesn't use keyEncryptKeyfile()
-	function testKeyEncryptKeyfile() {
-	
-		# TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
-		
-		// Generate keypair
-		$pair1 = Encryption\Crypt::createKeypair();
-		
-		// Encrypt plain data, generate keyfile & encrypted file
-		$cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
-		
-		// Encrypt keyfile
-		$cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
-		
-		// Decrypt keyfile
-		$decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
-		
-		// Decrypt encrypted file
-		$decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
-		
-		$this->assertEquals( $this->dataUrl, $decryptData );
-	
-	}
-	
-	/**
-	 * @brief test functionality of keyEncryptKeyfile() and 
-	 * keyDecryptKeyfile()
-	 */
-	function testKeyDecryptKeyfile() {
-		
-		$encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
-		
-		$this->assertNotEquals( $encrypted['data'], $this->dataShort );
-		
-		$decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
-		
-		$this->assertEquals( $decrypted, $this->dataShort );
-		
-	}
-
-	
-	/**
-	 * @brief test encryption using legacy blowfish method
-	 */
-	function testLegacyEncryptShort() {
-	
-		$crypted = Encryption\Crypt::legacyEncrypt( $this->dataShort, $this->pass );
-
-		$this->assertNotEquals( $this->dataShort, $crypted );
-		
-		# TODO: search inencrypted text for actual content to ensure it
-		# genuine transformation
-		
-		return $crypted;
-		
-	}
-	
-	/**
-	 * @brief test decryption using legacy blowfish method
-	 * @depends testLegacyEncryptShort
-	 */
-	function testLegacyDecryptShort( $crypted ) {
-	
-		$decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-		
-		$this->assertEquals( $this->dataShort, $decrypted );
-		
-	}
-
-	/**
-	 * @brief test encryption using legacy blowfish method
-	 */
-	function testLegacyEncryptLong() {
-	
-		$crypted = Encryption\Crypt::legacyEncrypt( $this->dataLong, $this->pass );
-
-		$this->assertNotEquals( $this->dataLong, $crypted );
-		
-		# TODO: search inencrypted text for actual content to ensure it
-		# genuine transformation
-		
-		return $crypted;
-		
-	}
-	
-	/**
-	 * @brief test decryption using legacy blowfish method
-	 * @depends testLegacyEncryptLong
-	 */
-	function testLegacyDecryptLong( $crypted ) {
-	
-		$decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
-		
-		$this->assertEquals( $this->dataLong, $decrypted );
-		
-	}
-	
-	/**
-	 * @brief test generation of legacy encryption key
-	 * @depends testLegacyDecryptShort
-	 */
-	function testLegacyCreateKey() {
-	
-		// Create encrypted key
-		$encKey = Encryption\Crypt::legacyCreateKey( $this->pass );
-		
-		// Decrypt key
-		$key = Encryption\Crypt::legacyDecrypt( $encKey, $this->pass );
-		
-		$this->assertTrue( is_numeric( $key ) );
-		
-		// Check that key is correct length
-		$this->assertEquals( 20, strlen( $key ) );
-		
-	}
-
-	/**
-	 * @brief test decryption using legacy blowfish method
-	 * @depends testLegacyEncryptLong
-	 */
-	function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
-	
-		$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
-		
-		$this->assertNotEquals( $this->dataLong, $recrypted['data'] );
-		
-		return $recrypted;
-		
-		# TODO: search inencrypted text for actual content to ensure it
-		# genuine transformation
-		
-	}
-
-// 	function testEncryption(){
-// 	
-// 		$key=uniqid();
-// 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// 		$source=file_get_contents($file); //nice large text file
-// 		$encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// 		$decrypted=rtrim($decrypted, "\0");
-// 		$this->assertNotEquals($encrypted,$source);
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 		$chunk=substr($source,0,8192);
-// 		$encrypted=OC_Encryption\Crypt::encrypt($chunk,$key);
-// 		$this->assertEquals(strlen($chunk),strlen($encrypted));
-// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// 		$decrypted=rtrim($decrypted, "\0");
-// 		$this->assertEquals($decrypted,$chunk);
-// 		
-// 		$encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// 		$this->assertNotEquals($encrypted,$source);
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 		$tmpFileEncrypted=OCP\Files::tmpFile();
-// 		OC_Encryption\Crypt::encryptfile($file,$tmpFileEncrypted,$key);
-// 		$encrypted=file_get_contents($tmpFileEncrypted);
-// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// 		$this->assertNotEquals($encrypted,$source);
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 		$tmpFileDecrypted=OCP\Files::tmpFile();
-// 		OC_Encryption\Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
-// 		$decrypted=file_get_contents($tmpFileDecrypted);
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 		$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
-// 		$source=file_get_contents($file); //binary file
-// 		$encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// 		$decrypted=rtrim($decrypted, "\0");
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 		$encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 	}
-// 
-// 	function testBinary(){
-// 		$key=uniqid();
-// 	
-// 		$file=__DIR__.'/binary';
-// 		$source=file_get_contents($file); //binary file
-// 		$encrypted=OC_Encryption\Crypt::encrypt($source,$key);
-// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
-// 
-// 		$decrypted=rtrim($decrypted, "\0");
-// 		$this->assertEquals($decrypted,$source);
-// 
-// 		$encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
-// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
-// 		$this->assertEquals($decrypted,$source);
-// 	}
-	
-}
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/test/keymanager.php
deleted file mode 100644
index bf453fe3163b8455136fc5b501beb451ba54c251..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/keymanager.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-use OCA\Encryption;
-
-// This has to go here because otherwise session errors arise, and the private 
-// encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
-
-class Test_Keymanager extends \PHPUnit_Framework_TestCase {
-	
-	function setUp() {
-		
-		\OC_FileProxy::$enabled = false;
-		
-		// set content for encrypting / decrypting in tests
-		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-		$this->dataShort = 'hats';
-		$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
-		$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
-		$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
-		$this->randomKey = Encryption\Crypt::generateKey();
-		
-		$keypair = Encryption\Crypt::createKeypair();
-		$this->genPublicKey =  $keypair['publicKey'];
-		$this->genPrivateKey = $keypair['privateKey'];
-		
-		$this->view = new \OC_FilesystemView( '/' );
-		
-		\OC_User::setUserId( 'admin' );
-		$this->userId = 'admin';
-		$this->pass = 'admin';
-		
-		\OC_Filesystem::init( '/' );
-		\OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
-	
-	}
-	
-	function tearDown(){
-	
-		\OC_FileProxy::$enabled = true;
-		
-	}
-
-	function testGetPrivateKey() {
-	
-		$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-		 
-		// Will this length vary? Perhaps we should use a range instead
-		$this->assertEquals( 2296, strlen( $key ) );
-	
-	}
-	
-	function testGetPublicKey() {
-
-		$key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
-		
-		$this->assertEquals( 451, strlen( $key ) );
-		
-		$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
-	}
-	
-	function testSetFileKey() {
-	
-		# NOTE: This cannot be tested until we are able to break out 
-		# of the FileSystemView data directory root
-	
-		$key = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->randomKey, 'hat' );
-		
-		$path = 'unittest-'.time().'txt';
-		
-		//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
-		
-		Encryption\Keymanager::setFileKey( $this->view, $path, $this->userId, $key['key'] );
-	
-	}
-	
-// 	/**
-// 	 * @depends testGetPrivateKey
-// 	 */
-// 	function testGetPrivateKey_decrypt() {
-// 	
-// 		$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
-// 		
-// 		# TODO: replace call to Crypt with a mock object?
-// 		$decrypted = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->passphrase );
-// 		
-// 		$this->assertEquals( 1704, strlen( $decrypted ) );
-// 		
-// 		$this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
-// 	
-// 	}
-	
-	function testGetUserKeys() {
-	
-		$keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
-		
-		$this->assertEquals( 451, strlen( $keys['publicKey'] ) );
-		$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
-		$this->assertEquals( 2296, strlen( $keys['privateKey'] ) );
-	
-	}
-	
-	function testGetPublicKeys() {
-		
-		# TODO: write me
-		
-	}
-	
-	function testGetFileKey() {
-	
-// 		Encryption\Keymanager::getFileKey( $this->view, $this->userId, $this->filePath );
-	
-	}
-	
-}
diff --git a/apps/files_encryption/test/legacy-encrypted-text.txt b/apps/files_encryption/test/legacy-encrypted-text.txt
deleted file mode 100644
index cb5bf50550d91842c8a0bd214edf9569daeadc48..0000000000000000000000000000000000000000
Binary files a/apps/files_encryption/test/legacy-encrypted-text.txt and /dev/null differ
diff --git a/apps/files_encryption/test/stream.php b/apps/files_encryption/test/stream.php
deleted file mode 100644
index ba82ac80eabb17dc16d01dce0d61d0f042c8a1b0..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/stream.php
+++ /dev/null
@@ -1,226 +0,0 @@
-// <?php
-// /**
-//  * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
-//  * This file is licensed under the Affero General Public License version 3 or
-//  * later.
-//  * See the COPYING-README file.
-//  */
-//  
-// namespace OCA\Encryption;
-// 
-// class Test_Stream extends \PHPUnit_Framework_TestCase {
-// 
-// 	function setUp() {
-// 	
-// 		\OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-// 	
-// 		$this->empty = '';
-// 	
-// 		$this->stream = new Stream();
-// 		
-// 		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-// 		$this->dataShort = 'hats';
-// 		
-// 		$this->emptyTmpFilePath = \OCP\Files::tmpFile();
-// 		
-// 		$this->dataTmpFilePath = \OCP\Files::tmpFile();
-// 		
-// 		file_put_contents( $this->dataTmpFilePath, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est." );
-// 	
-// 	}
-// 	
-// 	function testStreamOpen() {
-// 		
-// 		$stream1 = new Stream();
-// 		
-// 		$handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-// 		
-// 		// Test that resource was returned successfully
-// 		$this->assertTrue( $handle1 );
-// 		
-// 		// Test that file has correct size
-// 		$this->assertEquals( 0, $stream1->size );
-// 		
-// 		// Test that path is correct
-// 		$this->assertEquals( $this->emptyTmpFilePath, $stream1->rawPath );
-// 		
-// 		$stream2 = new Stream();
-// 		
-// 		$handle2 = $stream2->stream_open( 'crypt://' . $this->emptyTmpFilePath, 'wb', array(), $this->empty );
-// 		
-// 		// Test that protocol identifier is removed from path
-// 		$this->assertEquals( $this->emptyTmpFilePath, $stream2->rawPath );
-// 
-// 		// "Stat failed error" prevents this test from executing
-// // 		$stream3 = new Stream();
-// // 		
-// // 		$handle3 = $stream3->stream_open( $this->dataTmpFilePath, 'r', array(), $this->empty );
-// // 		
-// // 		$this->assertEquals( 0, $stream3->size );
-// 	
-// 	}
-// 	
-// 	function testStreamWrite() {
-// 		
-// 		$stream1 = new Stream();
-// 		
-// 		$handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'r+b', array(), $this->empty );
-// 		
-// 		# what about the keymanager? there is no key for the newly created temporary file!
-// 		
-// 		$stream1->stream_write( $this->dataShort );
-// 	
-// 	}
-// 
-// // 	function getStream( $id, $mode, $size ) {
-// // 	
-// // 		if ( $id === '' ) {
-// // 			
-// // 			$id = uniqid();
-// // 		}
-// // 		
-// // 		
-// // 		if ( !isset( $this->tmpFiles[$id] ) ) {
-// // 		
-// // 			// If tempfile with given name does not already exist, create it
-// // 			
-// // 			$file = OCP\Files::tmpFile();
-// // 			
-// // 			$this->tmpFiles[$id] = $file;
-// // 		
-// // 		} else {
-// // 		
-// // 			$file = $this->tmpFiles[$id];
-// // 		
-// // 		}
-// // 		
-// // 		$stream = fopen( $file, $mode );
-// // 		
-// // 		Stream::$sourceStreams[$id] = array( 'path' => 'dummy' . $id, 'stream' => $stream, 'size' => $size );
-// // 		
-// // 		return fopen( 'crypt://streams/'.$id, $mode );
-// // 	
-// // 	}
-// // 
-// // 	function testStream(  ){
-// // 
-// // 		$stream = $this->getStream( 'test1', 'w', strlen( 'foobar' ) );
-// // 
-// // 		fwrite( $stream, 'foobar' );
-// // 
-// // 		fclose( $stream );
-// // 
-// // 
-// // 		$stream = $this->getStream( 'test1', 'r', strlen( 'foobar' ) );
-// // 
-// // 		$data = fread( $stream, 6 );
-// // 
-// // 		fclose( $stream );
-// // 
-// // 		$this->assertEquals( 'foobar', $data );
-// // 
-// // 
-// // 		$file = OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// // 
-// // 		$source = fopen( $file, 'r' );
-// // 
-// // 		$target = $this->getStream( 'test2', 'w', 0 );
-// // 
-// // 		OCP\Files::streamCopy( $source, $target );
-// // 
-// // 		fclose( $target );
-// // 
-// // 		fclose( $source );
-// // 
-// // 
-// // 		$stream = $this->getStream( 'test2', 'r', filesize( $file ) );
-// // 
-// // 		$data = stream_get_contents( $stream );
-// // 
-// // 		$original = file_get_contents( $file );
-// // 
-// // 		$this->assertEquals( strlen( $original ), strlen( $data ) );
-// // 
-// // 		$this->assertEquals( $original, $data );
-// // 
-// // 	}
-// 
-// }
-// 
-// // class Test_CryptStream extends PHPUnit_Framework_TestCase {
-// // 	private $tmpFiles=array();
-// // 	
-// // 	function testStream(){
-// // 		$stream=$this->getStream('test1','w',strlen('foobar'));
-// // 		fwrite($stream,'foobar');
-// // 		fclose($stream);
-// // 
-// // 		$stream=$this->getStream('test1','r',strlen('foobar'));
-// // 		$data=fread($stream,6);
-// // 		fclose($stream);
-// // 		$this->assertEquals('foobar',$data);
-// // 
-// // 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// // 		$source=fopen($file,'r');
-// // 		$target=$this->getStream('test2','w',0);
-// // 		OCP\Files::streamCopy($source,$target);
-// // 		fclose($target);
-// // 		fclose($source);
-// // 
-// // 		$stream=$this->getStream('test2','r',filesize($file));
-// // 		$data=stream_get_contents($stream);
-// // 		$original=file_get_contents($file);
-// // 		$this->assertEquals(strlen($original),strlen($data));
-// // 		$this->assertEquals($original,$data);
-// // 	}
-// // 
-// // 	/**
-// // 	 * get a cryptstream to a temporary file
-// // 	 * @param string $id
-// // 	 * @param string $mode
-// // 	 * @param int size
-// // 	 * @return resource
-// // 	 */
-// // 	function getStream($id,$mode,$size){
-// // 		if($id===''){
-// // 			$id=uniqid();
-// // 		}
-// // 		if(!isset($this->tmpFiles[$id])){
-// // 			$file=OCP\Files::tmpFile();
-// // 			$this->tmpFiles[$id]=$file;
-// // 		}else{
-// // 			$file=$this->tmpFiles[$id];
-// // 		}
-// // 		$stream=fopen($file,$mode);
-// // 		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
-// // 		return fopen('crypt://streams/'.$id,$mode);
-// // 	}
-// // 
-// // 	function testBinary(){
-// // 		$file=__DIR__.'/binary';
-// // 		$source=file_get_contents($file);
-// // 
-// // 		$stream=$this->getStream('test','w',strlen($source));
-// // 		fwrite($stream,$source);
-// // 		fclose($stream);
-// // 
-// // 		$stream=$this->getStream('test','r',strlen($source));
-// // 		$data=stream_get_contents($stream);
-// // 		fclose($stream);
-// // 		$this->assertEquals(strlen($data),strlen($source));
-// // 		$this->assertEquals($source,$data);
-// // 
-// // 		$file=__DIR__.'/zeros';
-// // 		$source=file_get_contents($file);
-// // 
-// // 		$stream=$this->getStream('test2','w',strlen($source));
-// // 		fwrite($stream,$source);
-// // 		fclose($stream);
-// // 
-// // 		$stream=$this->getStream('test2','r',strlen($source));
-// // 		$data=stream_get_contents($stream);
-// // 		fclose($stream);
-// // 		$this->assertEquals(strlen($data),strlen($source));
-// // 		$this->assertEquals($source,$data);
-// // 	}
-// // }
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
deleted file mode 100755
index 1cdeff8008df2417e7e09c6cdbbb11b9e414c065..0000000000000000000000000000000000000000
--- a/apps/files_encryption/test/util.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-//require_once "PHPUnit/Framework/TestCase.php";
-require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
-require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
-require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
-require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
-require_once realpath( dirname(__FILE__).'/../lib/util.php' );
-require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
-
-// Load mockery files
-require_once 'Mockery/Loader.php';
-require_once 'Hamcrest/Hamcrest.php';
-$loader = new \Mockery\Loader;
-$loader->register();
-
-use \Mockery as m;
-use OCA\Encryption;
-
-class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
-	
-	function setUp() {
-	
-		\OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
-		
-		// set content for encrypting / decrypting in tests
-		$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
-		$this->dataShort = 'hats';
-		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-		$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
-		$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
-		
-		$this->userId = 'admin';
-		$this->pass = 'admin';
-		
-		$keypair = Encryption\Crypt::createKeypair();
-		
-		$this->genPublicKey =  $keypair['publicKey'];
-		$this->genPrivateKey = $keypair['privateKey'];
-		
-		$this->publicKeyDir =  '/' . 'public-keys';
-		$this->encryptionDir =  '/' . $this->userId . '/' . 'files_encryption';
-		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
-		$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
-		$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
-		
-		$this->view = new \OC_FilesystemView( '/' );
-		
-		$this->mockView = m::mock('OC_FilesystemView');
-		$this->util = new Encryption\Util( $this->mockView, $this->userId );
-	
-	}
-	
-	function tearDown(){
-	
-		m::close();
-	
-	}
-	
-	/**
-	 * @brief test that paths set during User construction are correct
-	 */
-	function testKeyPaths() {
-	
-		$mockView = m::mock('OC_FilesystemView');
-		
-		$util = new Encryption\Util( $mockView, $this->userId );
-		
-		$this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
-		$this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
-		$this->assertEquals( $this->keyfilesPath, $util->getPath( 'keyfilesPath' ) );
-		$this->assertEquals( $this->publicKeyPath, $util->getPath( 'publicKeyPath' ) );
-		$this->assertEquals( $this->privateKeyPath, $util->getPath( 'privateKeyPath' ) );
-	
-	}
-	
-	/**
-	 * @brief test setup of encryption directories when they don't yet exist
-	 */
-	function testSetupServerSideNotSetup() {
-	
-		$mockView = m::mock('OC_FilesystemView');
-		
-		$mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( false );
-		$mockView->shouldReceive( 'mkdir' )->times(4)->andReturn( true );
-		$mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-		
-		$util = new Encryption\Util( $mockView, $this->userId );
-		
-		$this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-	
-	}
-	
-	/**
-	 * @brief test setup of encryption directories when they already exist
-	 */
-	function testSetupServerSideIsSetup() {
-	
-		$mockView = m::mock('OC_FilesystemView');
-		
-		$mockView->shouldReceive( 'file_exists' )->times(6)->andReturn( true );
-		$mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
-		
-		$util = new Encryption\Util( $mockView, $this->userId );
-		
-		$this->assertEquals( true, $util->setupServerSide( $this->pass ) );
-		
-	}
-	
-	/**
-	 * @brief test checking whether account is ready for encryption, when it isn't ready
-	 */
-	function testReadyNotReady() {
-	
-		$mockView = m::mock('OC_FilesystemView');
-		
-		$mockView->shouldReceive( 'file_exists' )->times(1)->andReturn( false );
-		
-		$util = new Encryption\Util( $mockView, $this->userId );
-		
-		$this->assertEquals( false, $util->ready() );
-		
-		# TODO: Add more tests here to check that if any of the dirs are 
-		# then false will be returned. Use strict ordering?
-		
-	}
-	
-	/**
-	 * @brief test checking whether account is ready for encryption, when it is ready
-	 */
-	function testReadyIsReady() {
-	
-		$mockView = m::mock('OC_FilesystemView');
-		
-		$mockView->shouldReceive( 'file_exists' )->times(3)->andReturn( true );
-		
-		$util = new Encryption\Util( $mockView, $this->userId );
-		
-		$this->assertEquals( true, $util->ready() );
-		
-		# TODO: Add more tests here to check that if any of the dirs are 
-		# then false will be returned. Use strict ordering?
-		
-	}
-	
-	function testFindFiles() {
-	
-// 		$this->view->chroot( "/data/{$this->userId}/files" );
-
-		$util = new Encryption\Util( $this->view, $this->userId );
-		
-		$files = $util->findFiles( '/', 'encrypted' );
-		
-		var_dump( $files );
-		
-		# TODO: Add more tests here to check that if any of the dirs are 
-		# then false will be returned. Use strict ordering?
-		
-	}
-
-// 	/**
-// 	 * @brief test decryption using legacy blowfish method
-// 	 * @depends testLegacyEncryptLong
-// 	 */
-// 	function testLegacyKeyRecryptKeyfileDecrypt( $recrypted ) {
-// 	
-// 		$decrypted = Encryption\Crypt::keyDecryptKeyfile( $recrypted['data'], $recrypted['key'], $this->genPrivateKey );
-// 		
-// 		$this->assertEquals( $this->dataLong, $decrypted );
-// 		
-// 	}
-	
-//	// Cannot use this test for now due to hidden dependencies in OC_FileCache
-// 	function testIsLegacyEncryptedContent() {
-// 		
-// 		$keyfileContent = OCA\Encryption\Crypt::symmetricEncryptFileContent( $this->legacyEncryptedData, 'hat' );
-// 		
-// 		$this->assertFalse( OCA\Encryption\Crypt::isLegacyEncryptedContent( $keyfileContent, '/files/admin/test.txt' ) );
-// 		
-// 		OC_FileCache::put( '/admin/files/legacy-encrypted-test.txt', $this->legacyEncryptedData );
-// 		
-// 		$this->assertTrue( OCA\Encryption\Crypt::isLegacyEncryptedContent( $this->legacyEncryptedData, '/files/admin/test.txt' ) );
-// 		
-// 	}
-
-//	// Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// 	function testGetLegacyKey() {
-// 		
-// 		$c = new \OCA\Encryption\Util( $view, false );
-// 
-// 		$bool = $c->getLegacyKey( 'admin' );
-//
-//		$this->assertTrue( $bool );
-// 		
-// 		$this->assertTrue( $c->legacyKey );
-// 		
-// 		$this->assertTrue( is_int( $c->legacyKey ) );
-// 		
-// 		$this->assertTrue( strlen( $c->legacyKey ) == 20 );
-//	
-// 	}
-
-//	// Cannot use this test for now due to need for different root in OC_Filesystem_view class
-// 	function testLegacyDecrypt() {
-// 
-// 		$c = new OCA\Encryption\Util( $this->view, false );
-// 		
-// 		$bool = $c->getLegacyKey( 'admin' );
-// 
-// 		$encrypted = $c->legacyEncrypt( $this->data, $c->legacyKey );
-// 		
-// 		$decrypted = $c->legacyDecrypt( $encrypted, $c->legacyKey );
-// 
-// 		$this->assertEquals( $decrypted, $this->data );
-// 	
-// 	}
-
-}
\ No newline at end of file
diff --git a/apps/files_encryption/test/binary b/apps/files_encryption/tests/binary
similarity index 100%
rename from apps/files_encryption/test/binary
rename to apps/files_encryption/tests/binary
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
new file mode 100755
index 0000000000000000000000000000000000000000..32156eea272446d8ccae2ff0aff4cc429ec58f70
--- /dev/null
+++ b/apps/files_encryption/tests/crypt.php
@@ -0,0 +1,809 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
+ * Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Crypt
+ */
+class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
+
+	public $userId;
+	public $pass;
+	public $stateFilesTrashbin;
+	public $dataLong;
+	public $dataUrl;
+	public $dataShort;
+	/**
+	 * @var OC_FilesystemView
+	 */
+	public $view;
+	public $legacyEncryptedData;
+	public $genPrivateKey;
+	public $genPublicKey;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerUserHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
+	}
+
+	function setUp() {
+		// set user id
+		\OC_User::setUserId(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+		$this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
+		$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
+
+		// set content for encrypting / decrypting in tests
+		$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+		$this->dataShort = 'hats';
+		$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+		$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->randomKey = Encryption\Crypt::generateKey();
+
+		$keypair = Encryption\Crypt::createKeypair();
+		$this->genPublicKey = $keypair['publicKey'];
+		$this->genPrivateKey = $keypair['privateKey'];
+
+		$this->view = new \OC_FilesystemView('/');
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+	}
+
+	function testGenerateKey() {
+
+		# TODO: use more accurate (larger) string length for test confirmation
+
+		$key = Encryption\Crypt::generateKey();
+
+		$this->assertTrue(strlen($key) > 16);
+
+	}
+
+	/**
+	 * @return String
+	 */
+	function testGenerateIv() {
+
+		$iv = Encryption\Crypt::generateIv();
+
+		$this->assertEquals(16, strlen($iv));
+
+		return $iv;
+
+	}
+
+	/**
+	 * @depends testGenerateIv
+	 */
+	function testConcatIv($iv) {
+
+		$catFile = Encryption\Crypt::concatIv($this->dataLong, $iv);
+
+		// Fetch encryption metadata from end of file
+		$meta = substr($catFile, -22);
+
+		$identifier = substr($meta, 0, 6);
+
+		// Fetch IV from end of file
+		$foundIv = substr($meta, 6);
+
+		$this->assertEquals('00iv00', $identifier);
+
+		$this->assertEquals($iv, $foundIv);
+
+		// Remove IV and IV identifier text to expose encrypted content
+		$data = substr($catFile, 0, -22);
+
+		$this->assertEquals($this->dataLong, $data);
+
+		return array(
+			'iv' => $iv
+		,
+			'catfile' => $catFile
+		);
+
+	}
+
+	/**
+	 * @depends testConcatIv
+	 */
+	function testSplitIv($testConcatIv) {
+
+		// Split catfile into components
+		$splitCatfile = Encryption\Crypt::splitIv($testConcatIv['catfile']);
+
+		// Check that original IV and split IV match
+		$this->assertEquals($testConcatIv['iv'], $splitCatfile['iv']);
+
+		// Check that original data and split data match
+		$this->assertEquals($this->dataLong, $splitCatfile['encrypted']);
+
+	}
+
+	/**
+	 * @return string padded
+	 */
+	function testAddPadding() {
+
+		$padded = Encryption\Crypt::addPadding($this->dataLong);
+
+		$padding = substr($padded, -2);
+
+		$this->assertEquals('xx', $padding);
+
+		return $padded;
+
+	}
+
+	/**
+	 * @depends testAddPadding
+	 */
+	function testRemovePadding($padded) {
+
+		$noPadding = Encryption\Crypt::RemovePadding($padded);
+
+		$this->assertEquals($this->dataLong, $noPadding);
+
+	}
+
+	function testEncrypt() {
+
+		$random = openssl_random_pseudo_bytes(13);
+
+		$iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+		$crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+		$this->assertNotEquals($this->dataUrl, $crypted);
+
+	}
+
+	function testDecrypt() {
+
+		$random = openssl_random_pseudo_bytes(13);
+
+		$iv = substr(base64_encode($random), 0, -4); // i.e. E5IG033j+mRNKrht
+
+		$crypted = Encryption\Crypt::encrypt($this->dataUrl, $iv, 'hat');
+
+		$decrypt = Encryption\Crypt::decrypt($crypted, $iv, 'hat');
+
+		$this->assertEquals($this->dataUrl, $decrypt);
+
+	}
+
+	function testSymmetricEncryptFileContent() {
+
+		# TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+		$crypted = Encryption\Crypt::symmetricEncryptFileContent($this->dataShort, 'hat');
+
+		$this->assertNotEquals($this->dataShort, $crypted);
+
+
+		$decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted, 'hat');
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+	}
+
+	function testSymmetricStreamEncryptShortFileContent() {
+
+		$filename = 'tmp-' . time() . '.test';
+
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// Get file contents without using any wrapper to get it's actual contents on disk
+		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+		// Re-enable proxy - our work is done
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// Check that the file was encrypted before being written to disk
+		$this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
+
+		// Get the encrypted keyfile
+		$encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
+
+		// Attempt to fetch the user's shareKey
+		$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
+
+		// get session
+		$session = new \OCA\Encryption\Session($this->view);
+
+		// get private key
+		$privateKey = $session->getPrivateKey($this->userId);
+
+		// Decrypt keyfile with shareKey
+		$plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+		// Manually decrypt
+		$manualDecrypt = Encryption\Crypt::symmetricDecryptFileContent($retreivedCryptedFile, $plainKeyfile);
+
+		// Check that decrypted data matches
+		$this->assertEquals($this->dataShort, $manualDecrypt);
+
+		// Teardown
+		$this->view->unlink($this->userId . '/files/' . $filename);
+
+		Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+	}
+
+	/**
+	 * @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
+	 * reassembly of its data
+	 */
+	function testSymmetricStreamEncryptLongFileContent() {
+
+		// Generate a a random filename
+		$filename = 'tmp-' . time() . '.test';
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong . $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// Get file contents without using any wrapper to get it's actual contents on disk
+		$retreivedCryptedFile = $this->view->file_get_contents($this->userId . '/files/' . $filename);
+
+		// Re-enable proxy - our work is done
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+
+		// Check that the file was encrypted before being written to disk
+		$this->assertNotEquals($this->dataLong . $this->dataLong, $retreivedCryptedFile);
+
+		// Manuallly split saved file into separate IVs and encrypted chunks
+		$r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
+
+		//print_r($r);
+
+		// Join IVs and their respective data chunks
+		$e = array(
+			$r[0] . $r[1],
+			$r[2] . $r[3],
+			$r[4] . $r[5],
+			$r[6] . $r[7],
+			$r[8] . $r[9],
+			$r[10] . $r[11]
+		); //.$r[11], $r[12].$r[13], $r[14] );
+
+		//print_r($e);
+
+		// Get the encrypted keyfile
+		$encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename);
+
+		// Attempt to fetch the user's shareKey
+		$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename);
+
+		// get session
+		$session = new \OCA\Encryption\Session($this->view);
+
+		// get private key
+		$privateKey = $session->getPrivateKey($this->userId);
+
+		// Decrypt keyfile with shareKey
+		$plainKeyfile = Encryption\Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
+
+		// Set var for reassembling decrypted content
+		$decrypt = '';
+
+		// Manually decrypt chunk
+		foreach ($e as $chunk) {
+
+			$chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent($chunk, $plainKeyfile);
+
+			// Assemble decrypted chunks
+			$decrypt .= $chunkDecrypt;
+
+		}
+
+		$this->assertEquals($this->dataLong . $this->dataLong, $decrypt);
+
+		// Teardown
+
+		$this->view->unlink($this->userId . '/files/' . $filename);
+
+		Encryption\Keymanager::deleteFileKey($this->view, $this->userId, $filename);
+
+	}
+
+	/**
+	 * @brief Test that data that is read by the crypto stream wrapper
+	 */
+	function testSymmetricStreamDecryptShortFileContent() {
+
+		$filename = 'tmp-' . time();
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$this->assertTrue(Encryption\Crypt::isEncryptedMeta($filename));
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// Get file decrypted contents
+		$decrypt = file_get_contents('crypt://' . $filename);
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+		// tear down
+		$this->view->unlink($this->userId . '/files/' . $filename);
+	}
+
+	function testSymmetricStreamDecryptLongFileContent() {
+
+		$filename = 'tmp-' . time();
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = file_get_contents('crypt://' . $filename);
+
+		$this->assertEquals($this->dataLong, $decrypt);
+
+		// tear down
+		$this->view->unlink($this->userId . '/files/' . $filename);
+	}
+
+	function testSymmetricEncryptFileContentKeyfile() {
+
+		# TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+		$crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->dataUrl);
+
+		$this->assertNotEquals($this->dataUrl, $crypted['encrypted']);
+
+
+		$decrypt = Encryption\Crypt::symmetricDecryptFileContent($crypted['encrypted'], $crypted['key']);
+
+		$this->assertEquals($this->dataUrl, $decrypt);
+
+	}
+
+	function testIsEncryptedContent() {
+
+		$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
+
+		$this->assertFalse(Encryption\Crypt::isCatfileContent($this->legacyEncryptedData));
+
+		$keyfileContent = Encryption\Crypt::symmetricEncryptFileContent($this->dataUrl, 'hat');
+
+		$this->assertTrue(Encryption\Crypt::isCatfileContent($keyfileContent));
+
+	}
+
+	function testMultiKeyEncrypt() {
+
+		# TODO: search in keyfile for actual content as IV will ensure this test always passes
+
+		$pair1 = Encryption\Crypt::createKeypair();
+
+		$this->assertEquals(2, count($pair1));
+
+		$this->assertTrue(strlen($pair1['publicKey']) > 1);
+
+		$this->assertTrue(strlen($pair1['privateKey']) > 1);
+
+
+		$crypted = Encryption\Crypt::multiKeyEncrypt($this->dataShort, array($pair1['publicKey']));
+
+		$this->assertNotEquals($this->dataShort, $crypted['data']);
+
+
+		$decrypt = Encryption\Crypt::multiKeyDecrypt($crypted['data'], $crypted['keys'][0], $pair1['privateKey']);
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+	}
+
+	function testKeyEncrypt() {
+
+		// Generate keypair
+		$pair1 = Encryption\Crypt::createKeypair();
+
+		// Encrypt data
+		$crypted = Encryption\Crypt::keyEncrypt($this->dataUrl, $pair1['publicKey']);
+
+		$this->assertNotEquals($this->dataUrl, $crypted);
+
+		// Decrypt data
+		$decrypt = Encryption\Crypt::keyDecrypt($crypted, $pair1['privateKey']);
+
+		$this->assertEquals($this->dataUrl, $decrypt);
+
+	}
+
+	/**
+	 * @brief test encryption using legacy blowfish method
+	 */
+	function testLegacyEncryptShort() {
+
+		$crypted = Encryption\Crypt::legacyEncrypt($this->dataShort, $this->pass);
+
+		$this->assertNotEquals($this->dataShort, $crypted);
+
+		# TODO: search inencrypted text for actual content to ensure it
+		# genuine transformation
+
+		return $crypted;
+
+	}
+
+	/**
+	 * @brief test decryption using legacy blowfish method
+	 * @depends testLegacyEncryptShort
+	 */
+	function testLegacyDecryptShort($crypted) {
+
+		$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
+
+		$this->assertEquals($this->dataShort, $decrypted);
+
+	}
+
+	/**
+	 * @brief test encryption using legacy blowfish method
+	 */
+	function testLegacyEncryptLong() {
+
+		$crypted = Encryption\Crypt::legacyEncrypt($this->dataLong, $this->pass);
+
+		$this->assertNotEquals($this->dataLong, $crypted);
+
+		# TODO: search inencrypted text for actual content to ensure it
+		# genuine transformation
+
+		return $crypted;
+
+	}
+
+	/**
+	 * @brief test decryption using legacy blowfish method
+	 * @depends testLegacyEncryptLong
+	 */
+	function testLegacyDecryptLong($crypted) {
+
+		$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
+
+		$this->assertEquals($this->dataLong, $decrypted);
+
+		$this->assertFalse(Encryption\Crypt::getBlowfish(''));
+	}
+
+	/**
+	 * @brief test generation of legacy encryption key
+	 * @depends testLegacyDecryptShort
+	 */
+	function testLegacyCreateKey() {
+
+		// Create encrypted key
+		$encKey = Encryption\Crypt::legacyCreateKey($this->pass);
+
+		// Decrypt key
+		$key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
+
+		$this->assertTrue(is_numeric($key));
+
+		// Check that key is correct length
+		$this->assertEquals(20, strlen($key));
+
+	}
+
+	/**
+	 * @brief test decryption using legacy blowfish method
+	 * @depends testLegacyEncryptLong
+	 */
+	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();
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = file_get_contents('crypt://' . $filename);
+
+		$this->assertEquals($this->dataLong, $decrypt);
+
+		$newFilename = 'tmp-new-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+		$view->rename($filename, $newFilename);
+
+		// Get file decrypted contents
+		$newDecrypt = file_get_contents('crypt://' . $newFilename);
+
+		$this->assertEquals($this->dataLong, $newDecrypt);
+
+		// tear down
+		$view->unlink($newFilename);
+	}
+
+	function testMoveFileIntoFolder() {
+
+		$filename = 'tmp-' . time();
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = file_get_contents('crypt://' . $filename);
+
+		$this->assertEquals($this->dataLong, $decrypt);
+
+		$newFolder = '/newfolder' . time();
+		$newFilename = 'tmp-new-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+		$view->mkdir($newFolder);
+		$view->rename($filename, $newFolder . '/' . $newFilename);
+
+		// Get file decrypted contents
+		$newDecrypt = file_get_contents('crypt://' . $newFolder . '/' . $newFilename);
+
+		$this->assertEquals($this->dataLong, $newDecrypt);
+
+		// tear down
+		$view->unlink($newFolder);
+	}
+
+	function testMoveFolder() {
+
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		$filename = '/tmp-' . time();
+		$folder = '/folder' . time();
+
+		$view->mkdir($folder);
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = file_get_contents('crypt://' . $folder . $filename);
+
+		$this->assertEquals($this->dataLong, $decrypt);
+
+		$newFolder = '/newfolder/subfolder' . time();
+		$view->mkdir('/newfolder');
+
+		$view->rename($folder, $newFolder);
+
+		// Get file decrypted contents
+		$newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
+
+		$this->assertEquals($this->dataLong, $newDecrypt);
+
+		// tear down
+		$view->unlink($newFolder);
+		$view->unlink('/newfolder');
+	}
+
+	function testChangePassphrase() {
+		$filename = 'tmp-' . time();
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = file_get_contents('crypt://' . $filename);
+
+		$this->assertEquals($this->dataLong, $decrypt);
+
+		// change password
+		\OC_User::setPassword($this->userId, 'test', null);
+
+		// relogin
+		$params['uid'] = $this->userId;
+		$params['password'] = 'test';
+		OCA\Encryption\Hooks::login($params);
+
+		// Get file decrypted contents
+		$newDecrypt = file_get_contents('crypt://' . $filename);
+
+		$this->assertEquals($this->dataLong, $newDecrypt);
+
+		// tear down
+		// change password back
+		\OC_User::setPassword($this->userId, $this->pass);
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+		$view->unlink($filename);
+	}
+
+	function testViewFilePutAndGetContents() {
+
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = $view->file_get_contents($filename);
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFileLong = $view->file_put_contents($filename, $this->dataLong);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFileLong));
+
+		// Get file decrypted contents
+		$decryptLong = $view->file_get_contents($filename);
+
+		$this->assertEquals($this->dataLong, $decryptLong);
+
+		// tear down
+		$view->unlink($filename);
+	}
+
+	function testTouchExistingFile() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		$view->touch($filename);
+
+		// Get file decrypted contents
+		$decrypt = $view->file_get_contents($filename);
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+		// tear down
+		$view->unlink($filename);
+	}
+
+	function testTouchFile() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		$view->touch($filename);
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// Get file decrypted contents
+		$decrypt = $view->file_get_contents($filename);
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+		// tear down
+		$view->unlink($filename);
+	}
+
+	function testFopenFile() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		$handle = $view->fopen($filename, 'r');
+
+		// Get file decrypted contents
+		$decrypt = fgets($handle);
+
+		$this->assertEquals($this->dataShort, $decrypt);
+
+		// tear down
+		$view->unlink($filename);
+	}
+}
diff --git a/apps/files_encryption/tests/encryption.key b/apps/files_encryption/tests/encryption.key
new file mode 100644
index 0000000000000000000000000000000000000000..4ee962145c247ee03538aa70a2ff0da216c5c51c
Binary files /dev/null and b/apps/files_encryption/tests/encryption.key differ
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..40ae1659a554518590165c337789e62e25a299e6
--- /dev/null
+++ b/apps/files_encryption/tests/keymanager.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Keymanager
+ */
+class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
+
+	public $userId;
+	public $pass;
+	public $stateFilesTrashbin;
+	/**
+	 * @var OC_FilesystemView
+	 */
+	public $view;
+	public $randomKey;
+	public $dataShort;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// disable file proxy by default
+		\OC_FileProxy::$enabled = false;
+
+		// setup filesystem
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		\OC\Files\Filesystem::tearDown();
+		\OC_Util::setupFS('admin');
+		\OC_User::setUserId('admin');
+
+		// login admin
+		$params['uid'] = 'admin';
+		$params['password'] = 'admin';
+		OCA\Encryption\Hooks::login($params);
+	}
+
+	function setUp() {
+		// set content for encrypting / decrypting in tests
+		$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+		$this->dataShort = 'hats';
+		$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+		$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
+		$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
+		$this->randomKey = Encryption\Crypt::generateKey();
+
+		$keypair = Encryption\Crypt::createKeypair();
+		$this->genPublicKey = $keypair['publicKey'];
+		$this->genPrivateKey = $keypair['privateKey'];
+
+		$this->view = new \OC_FilesystemView('/');
+
+		\OC_User::setUserId('admin');
+		$this->userId = 'admin';
+		$this->pass = 'admin';
+
+		$userHome = \OC_User::getHome($this->userId);
+		$this->dataDir = str_replace('/' . $this->userId, '', $userHome);
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		\OC_FileProxy::$enabled = true;
+	}
+
+	function testGetPrivateKey() {
+
+		$key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
+
+		$privateKey = Encryption\Crypt::symmetricDecryptFileContent($key, $this->pass);
+
+		$res = openssl_pkey_get_private($privateKey);
+
+		$this->assertTrue(is_resource($res));
+
+		$sslInfo = openssl_pkey_get_details($res);
+
+		$this->assertArrayHasKey('key', $sslInfo);
+
+	}
+
+	function testGetPublicKey() {
+
+		$publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
+
+		$res = openssl_pkey_get_public($publiceKey);
+
+		$this->assertTrue(is_resource($res));
+
+		$sslInfo = openssl_pkey_get_details($res);
+
+		$this->assertArrayHasKey('key', $sslInfo);
+	}
+
+	function testSetFileKey() {
+
+		# NOTE: This cannot be tested until we are able to break out 
+		# of the FileSystemView data directory root
+
+		$key = Encryption\Crypt::symmetricEncryptFileContentKeyfile($this->randomKey, 'hat');
+
+		$file = 'unittest-' . time() . '.txt';
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$this->view->file_put_contents($this->userId . '/files/' . $file, $key['encrypted']);
+
+		// Re-enable proxy - our work is done
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
+		Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key['key']);
+
+		// enable encryption proxy
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = true;
+
+		// cleanup
+		$this->view->unlink('/' . $this->userId . '/files/' . $file);
+
+		// change encryption proxy to previous state
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+	}
+
+	function testGetUserKeys() {
+
+		$keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
+
+		$resPublic = openssl_pkey_get_public($keys['publicKey']);
+
+		$this->assertTrue(is_resource($resPublic));
+
+		$sslInfoPublic = openssl_pkey_get_details($resPublic);
+
+		$this->assertArrayHasKey('key', $sslInfoPublic);
+
+		$privateKey = Encryption\Crypt::symmetricDecryptFileContent($keys['privateKey'], $this->pass);
+
+		$resPrivate = openssl_pkey_get_private($privateKey);
+
+		$this->assertTrue(is_resource($resPrivate));
+
+		$sslInfoPrivate = openssl_pkey_get_details($resPrivate);
+
+		$this->assertArrayHasKey('key', $sslInfoPrivate);
+	}
+
+	function testFixPartialFilePath() {
+
+		$partFilename = 'testfile.txt.part';
+		$filename = 'testfile.txt';
+
+		$this->assertTrue(Encryption\Keymanager::isPartialFilePath($partFilename));
+
+		$this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($partFilename));
+
+		$this->assertFalse(Encryption\Keymanager::isPartialFilePath($filename));
+
+		$this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
+	}
+
+	function testRecursiveDelShareKeys() {
+
+		// generate filename
+		$filename = '/tmp-' . time() . '.txt';
+
+		// create folder structure
+		$this->view->mkdir('/admin/files/folder1');
+		$this->view->mkdir('/admin/files/folder1/subfolder');
+		$this->view->mkdir('/admin/files/folder1/subfolder/subsubfolder');
+
+		// enable encryption proxy
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = true;
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt:///folder1/subfolder/subsubfolder/' . $filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// change encryption proxy to previous state
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// recursive delete keys
+		Encryption\Keymanager::delShareKey($this->view, array('admin'), '/folder1/');
+
+		// check if share key not exists
+		$this->assertFalse($this->view->file_exists(
+			'/admin/files_encryption/share-keys/folder1/subfolder/subsubfolder/' . $filename . '.admin.shareKey'));
+
+		// enable encryption proxy
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = true;
+
+		// cleanup
+		$this->view->unlink('/admin/files/folder1');
+
+		// change encryption proxy to previous state
+		\OC_FileProxy::$enabled = $proxyStatus;
+	}
+}
diff --git a/apps/files_encryption/tests/legacy-encrypted-text.txt b/apps/files_encryption/tests/legacy-encrypted-text.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1f5087178cd1b4829abb3483f65322296d2235f0
--- /dev/null
+++ b/apps/files_encryption/tests/legacy-encrypted-text.txt
@@ -0,0 +1 @@
+ð˜¯5–¡‹Ç¡i›òë³Zg§ESlÁF=Àªð
\ No newline at end of file
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/tests/proxy.php
similarity index 98%
rename from apps/files_encryption/test/proxy.php
rename to apps/files_encryption/tests/proxy.php
index 709730f7609ca2464a1faa2c410569b50fa80c19..5a2d851ff7c1019144c132875d94ddc28506ab07 100644
--- a/apps/files_encryption/test/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -52,7 +52,7 @@
 // 		$this->userId = 'admin';
 // 		$this->pass = 'admin';
 // 		
-// 		$this->session = new Encryption\Session();
+// 		$this->session = new Encryption\Session( $view ); // FIXME: Provide a $view object for use here
 // 		
 // $this->session->setPrivateKey( 
 // '-----BEGIN PRIVATE KEY-----
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
new file mode 100755
index 0000000000000000000000000000000000000000..816bc709f26df3a2f760152506626c16cc6b1cca
--- /dev/null
+++ b/apps/files_encryption/tests/share.php
@@ -0,0 +1,911 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../lib/helper.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Share
+ */
+class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_SHARE_USER1 = "test-share-user1";
+	const TEST_ENCRYPTION_SHARE_USER2 = "test-share-user2";
+	const TEST_ENCRYPTION_SHARE_USER3 = "test-share-user3";
+	const TEST_ENCRYPTION_SHARE_USER4 = "test-share-user4";
+	const TEST_ENCRYPTION_SHARE_GROUP1 = "test-share-group1";
+
+	public $stateFilesTrashbin;
+	public $filename;
+	public $dataShort;
+	/**
+	 * @var OC_FilesystemView
+	 */
+	public $view;
+	public $folder1;
+	public $subfolder;
+	public $subsubfolder;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// enable resharing
+		\OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes');
+
+		// clear share hooks
+		\OC_Hook::clear('OCP\\Share');
+		\OC::registerShareHooks();
+		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
+		// Sharing related hooks
+		\OCA\Encryption\Helper::registerShareHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create users
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, true);
+
+		// create group and assign users
+		\OC_Group::createGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+		\OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+		\OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+	}
+
+	function setUp() {
+		$this->dataShort = 'hats';
+		$this->view = new \OC_FilesystemView('/');
+
+		$this->folder1 = '/folder1';
+		$this->subfolder = '/subfolder1';
+		$this->subsubfolder = '/subsubfolder1';
+
+		$this->filename = 'share-tmp.test';
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		// clean group
+		\OC_Group::deleteGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+
+		// cleanup users
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+	}
+
+	/**
+	 * @param bool $withTeardown
+	 */
+	function testShareFile($withTeardown = true) {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get the file info from previous created file
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+		// check if we have a valid file info
+		$this->assertTrue(is_array($fileInfo));
+
+		// check if the unencrypted file size is stored
+		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// share the file
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user1 exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+		// get file contents
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared/' . $this->filename);
+
+		// check if data is the same as we previously written
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// cleanup
+		if ($withTeardown) {
+
+			// login as admin
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+			// unshare the file
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+			// cleanup
+			$this->view->unlink(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		}
+	}
+
+	/**
+	 * @param bool $withTeardown
+	 */
+	function testReShareFile($withTeardown = true) {
+		$this->testShareFile(false);
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+		// get the file info
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared/' . $this->filename);
+
+		// share the file with user2
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user2 exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+		// login as user2
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+		// get file contents
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared/' . $this->filename);
+
+		// check if data is the same as previously written
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// cleanup
+		if ($withTeardown) {
+
+			// login as user1
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+			// unshare the file with user2
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+			// login as admin
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+			// unshare the file with user1
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+			// cleanup
+			$this->view->unlink(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		}
+	}
+
+	/**
+	 * @param bool $withTeardown
+	 * @return array
+	 */
+	function testShareFolder($withTeardown = true) {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// create folder structure
+		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+			. $this->subsubfolder);
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+										 . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get the file info from previous created folder
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+
+		// check if we have a valid file info
+		$this->assertTrue(is_array($fileInfo));
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// share the folder with user1
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user1 exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+		// get file contents
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+		// check if data is the same
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// cleanup
+		if ($withTeardown) {
+
+			// login as admin
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+			// unshare the folder with user1
+			\OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+			// cleanup
+			$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		}
+
+		return $fileInfo;
+	}
+
+	/**
+	 * @param bool $withTeardown
+	 */
+	function testReShareFolder($withTeardown = true) {
+		$fileInfoFolder1 = $this->testShareFolder(false);
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get the file info from previous created folder
+		$fileInfoSubFolder = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/Shared' . $this->folder1
+			. $this->subfolder);
+
+		// check if we have a valid file info
+		$this->assertTrue(is_array($fileInfoSubFolder));
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// share the file with user2
+		\OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user2 exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+		// login as user2
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+		// get file contents
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared' . $this->subfolder
+			. $this->subsubfolder . '/' . $this->filename);
+
+		// check if data is the same
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// get the file info
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared' . $this->subfolder
+			. $this->subsubfolder . '/' . $this->filename);
+
+		// check if we have fileInfos
+		$this->assertTrue(is_array($fileInfo));
+
+		// share the file with user3
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user3 exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+		// login as user3
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+
+		// get file contents
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '/files/Shared/' . $this->filename);
+
+		// check if data is the same
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// cleanup
+		if ($withTeardown) {
+
+			// login as user2
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+			// unshare the file with user3
+			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+			// login as user1
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+			// unshare the folder with user2
+			\OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+			// login as admin
+			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+			// unshare the folder1 with user1
+			\OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+
+			// cleanup
+			$this->view->unlink(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+				. $this->subsubfolder . '/' . $this->filename);
+
+			// check if share key not exists
+			$this->assertFalse($this->view->file_exists(
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		}
+	}
+
+	function testPublicShareFile() {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get the file info from previous created file
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+		// check if we have a valid file info
+		$this->assertTrue(is_array($fileInfo));
+
+		// check if the unencrypted file size is stored
+		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// share the file
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		$publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId');
+
+		// check if share key for public exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+		// some hacking to simulate public link
+		$GLOBALS['app'] = 'files_sharing';
+		$GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1;
+		\OC_User::setUserId(false);
+
+		// get file contents
+		$retrievedCryptedFile = file_get_contents('crypt://' . $this->filename);
+
+		// check if data is the same as we previously written
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// tear down
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// unshare the file
+		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+
+		// check if share key not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+
+		// cleanup
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+		// check if share key not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+	}
+
+	function testShareFileWithGroup() {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get the file info from previous created file
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+		// check if we have a valid file info
+		$this->assertTrue(is_array($fileInfo));
+
+		// check if the unencrypted file size is stored
+		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// share the file
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user2 and user3 exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+
+		// get file contents
+		$retrievedCryptedFile = $this->view->file_get_contents(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '/files/Shared/' . $this->filename);
+
+		// check if data is the same as we previously written
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// unshare the file
+		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+
+		// check if share key not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+
+		// cleanup
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+		// check if share key not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+
+	}
+
+	function testRecoveryFile() {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		\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);
+
+		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if recovery password match
+		$this->assertTrue($util->checkRecoveryPassword('test123'));
+
+		// enable recovery for admin
+		$this->assertTrue($util->setRecoveryForUser(1));
+
+		// create folder structure
+		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1 . $this->subfolder
+			. $this->subsubfolder);
+
+		// save file with content
+		$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+		$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+										  . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile1));
+		$this->assertTrue(is_int($cryptedFile2));
+
+		// check if share key for admin and recovery exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		// disable recovery for admin
+		$this->assertTrue($util->setRecoveryForUser(0));
+
+		// remove all recovery keys
+		$util->removeRecoveryKeys('/');
+
+		// check if share key for recovery not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		// enable recovery for admin
+		$this->assertTrue($util->setRecoveryForUser(1));
+
+		// remove all recovery keys
+		$util->addRecoveryKeys('/');
+
+		// check if share key for admin and recovery exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		// cleanup
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->folder1);
+
+		// check if share key for recovery not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		$this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
+		$this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
+		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
+	}
+
+	function testRecoveryForUser() {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		\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);
+
+		$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+
+		// enable recovery for admin
+		$this->assertTrue($util->setRecoveryForUser(1));
+
+		// create folder structure
+		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder);
+		$this->view->mkdir(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1 . $this->subfolder
+			. $this->subsubfolder);
+
+		// save file with content
+		$cryptedFile1 = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+		$cryptedFile2 = file_put_contents('crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
+										  . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile1));
+		$this->assertTrue(is_int($cryptedFile2));
+
+		// check if share key for user and recovery exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// change password
+		\OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
+
+		// get file contents
+		$retrievedCryptedFile1 = file_get_contents('crypt://' . $this->filename);
+		$retrievedCryptedFile2 = file_get_contents(
+			'crypt://' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename);
+
+		// check if data is the same as we previously written
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile1);
+		$this->assertEquals($this->dataShort, $retrievedCryptedFile2);
+
+		// cleanup
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->filename);
+
+		// check if share key for user and recovery exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			. $this->subfolder . $this->subsubfolder . '/'
+			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+
+		// enable recovery for admin
+		$this->assertTrue($util->setRecoveryForUser(0));
+
+		\OCA\Encryption\Helper::adminDisableRecovery('test123');
+		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
+	}
+
+	function testFailShareFile() {
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt://' . $this->filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get the file info from previous created file
+		$fileInfo = $this->view->getFileInfo(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+
+		// check if we have a valid file info
+		$this->assertTrue(is_array($fileInfo));
+
+		// check if the unencrypted file size is stored
+		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
+
+		// break users public key
+		$this->view->rename('/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key',
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup');
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// share the file
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+
+		// login as admin
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+
+		// check if share key for user1 not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// break user1 public key
+		$this->view->rename(
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup',
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key');
+
+		// remove share file
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+							. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3
+							. '.shareKey');
+
+		// re-enable the file proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// unshare the file with user1
+		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
+
+		// check if share key not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
+			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+
+		// cleanup
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
+	}
+
+}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d9787675428a879371aa481ab6d397c6d38c221
--- /dev/null
+++ b/apps/files_encryption/tests/stream.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Stream
+ * @brief this class provide basic stream tests
+ */
+class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_STREAM_USER1 = "test-stream-user1";
+
+	public $userId;
+	public $pass;
+	/**
+	 * @var \OC_FilesystemView
+	 */
+	public $view;
+	public $dataShort;
+	public $stateFilesTrashbin;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
+	}
+
+	function setUp() {
+		// set user id
+		\OC_User::setUserId(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+		$this->userId = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
+		$this->pass = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
+
+		// init filesystem view
+		$this->view = new \OC_FilesystemView('/');
+
+		// init short data
+		$this->dataShort = 'hats';
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+	}
+
+	function testStreamOptions() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		$handle = $view->fopen($filename, 'r');
+
+		// check if stream is at position zero
+		$this->assertEquals(0, ftell($handle));
+
+		// set stream options
+		$this->assertTrue(flock($handle, LOCK_SH));
+		$this->assertTrue(flock($handle, LOCK_UN));
+
+		// tear down
+		$view->unlink($filename);
+	}
+
+	function testStreamSetBlocking() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		$handle = $view->fopen($filename, 'r');
+
+		// set stream options
+		$this->assertTrue(stream_set_blocking($handle, 1));
+
+		// tear down
+		$view->unlink($filename);
+	}
+
+	function testStreamSetTimeout() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		$handle = $view->fopen($filename, 'r');
+
+		// set stream options
+		$this->assertFalse(stream_set_timeout($handle, 1));
+
+		// tear down
+		$view->unlink($filename);
+	}
+
+	function testStreamSetWriteBuffer() {
+		$filename = '/tmp-' . time();
+		$view = new \OC\Files\View('/' . $this->userId . '/files');
+
+		// Save short data as encrypted file using stream wrapper
+		$cryptedFile = $view->file_put_contents($filename, $this->dataShort);
+
+		// Test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		$handle = $view->fopen($filename, 'r');
+
+		// set stream options
+		$this->assertEquals(0, stream_set_write_buffer($handle, 1024));
+
+		// tear down
+		$view->unlink($filename);
+	}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
new file mode 100755
index 0000000000000000000000000000000000000000..29f8fb5a396a597641637d03005f550243d0ff33
--- /dev/null
+++ b/apps/files_encryption/tests/trashbin.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/../../files_trashbin/appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Trashbin
+ * @brief this class provide basic trashbin app tests
+ */
+class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
+
+	public $userId;
+	public $pass;
+	/**
+	 * @var \OC_FilesystemView
+	 */
+	public $view;
+	public $dataShort;
+	public $stateFilesTrashbin;
+	public $folder1;
+	public $subfolder;
+	public $subsubfolder;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		\OC_Hook::clear('OC_Filesystem');
+		\OC_Hook::clear('OC_User');
+
+		// trashbin hooks
+		\OCA\Files_Trashbin\Trashbin::registerHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1, true);
+	}
+
+	function setUp() {
+		// set user id
+		\OC_User::setUserId(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+		$this->userId = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
+		$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
+
+		// init filesystem view
+		$this->view = new \OC_FilesystemView('/');
+
+		// init short data
+		$this->dataShort = 'hats';
+
+		$this->folder1 = '/folder1';
+		$this->subfolder = '/subfolder1';
+		$this->subsubfolder = '/subsubfolder1';
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we want to tests with app files_trashbin enabled
+		\OC_App::enable('files_trashbin');
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+	}
+
+	/**
+	 * @brief test delete file
+	 */
+	function testDeleteFile() {
+
+		// generate filename
+		$filename = 'tmp-' . time() . '.txt';
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// check if key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
+
+		// check if share key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+		// delete file
+		\OC\FIles\Filesystem::unlink($filename);
+
+		// check if file not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+
+		// check if key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
+
+		// check if share key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+		// get files
+		$trashFiles = $this->view->getDirectoryContent(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
+
+		$trashFileSuffix = null;
+		// find created file with timestamp
+		foreach ($trashFiles as $file) {
+			if (strncmp($file['path'], $filename, strlen($filename))) {
+				$path_parts = pathinfo($file['name']);
+				$trashFileSuffix = $path_parts['extension'];
+			}
+		}
+
+		// check if we found the file we created
+		$this->assertNotNull($trashFileSuffix);
+
+		// check if key for admin not exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			. '.key.' . $trashFileSuffix));
+
+		// check if share key for admin not exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+
+		// return filename for next test
+		return $filename . '.' . $trashFileSuffix;
+	}
+
+	/**
+	 * @brief test restore file
+	 *
+	 * @depends testDeleteFile
+	 */
+	function testRestoreFile($filename) {
+
+		// prepare file information
+		$path_parts = pathinfo($filename);
+		$trashFileSuffix = $path_parts['extension'];
+		$timestamp = str_replace('d', '', $trashFileSuffix);
+		$fileNameWithoutSuffix = str_replace('.' . $trashFileSuffix, '', $filename);
+
+		// restore file
+		$this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename, $fileNameWithoutSuffix, $timestamp));
+
+		// check if file exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $fileNameWithoutSuffix));
+
+		// check if key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
+			. $fileNameWithoutSuffix . '.key'));
+
+		// check if share key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $fileNameWithoutSuffix . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+	}
+
+	/**
+	 * @brief test delete file forever
+	 */
+	function testPermanentDeleteFile() {
+
+		// generate filename
+		$filename = 'tmp-' . time() . '.txt';
+
+		// save file with content
+		$cryptedFile = file_put_contents('crypt:///' . $filename, $this->dataShort);
+
+		// test that data was successfully written
+		$this->assertTrue(is_int($cryptedFile));
+
+		// check if key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
+
+		// check if share key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+		// delete file
+		\OC\FIles\Filesystem::unlink($filename);
+
+		// check if file not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+
+		// check if key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			. '.key'));
+
+		// check if share key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
+		// find created file with timestamp
+		$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
+								 . ' WHERE `id`=?');
+		$result = $query->execute(array($filename))->fetchRow();
+
+		$this->assertTrue(is_array($result));
+
+		// build suffix
+		$trashFileSuffix = 'd' . $result['timestamp'];
+
+		// check if key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			. '.key.' . $trashFileSuffix));
+
+		// check if share key for admin exists
+		$this->assertTrue($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+
+		// get timestamp from file
+		$timestamp = str_replace('d', '', $trashFileSuffix);
+
+		// delete file forever
+		$this->assertGreaterThan(0, \OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp));
+
+		// check if key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
+			. $trashFileSuffix));
+
+		// check if key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			. '.key.' . $trashFileSuffix));
+
+		// check if share key for admin not exists
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
new file mode 100755
index 0000000000000000000000000000000000000000..0dc452a41c870de813b9034d3561542202edf2ff
--- /dev/null
+++ b/apps/files_encryption/tests/util.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Util
+ */
+class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_UTIL_USER1 = "test-util-user1";
+	const TEST_ENCRYPTION_UTIL_LEGACY_USER = "test-legacy-user";
+
+	public $userId;
+	public $encryptionDir;
+	public $publicKeyDir;
+	public $pass;
+	/**
+	 * @var OC_FilesystemView
+	 */
+	public $view;
+	public $keyfilesPath;
+	public $publicKeyPath;
+	public $privateKeyPath;
+	/**
+	 * @var \OCA\Encryption\Util
+	 */
+	public $util;
+	public $dataShort;
+	public $legacyEncryptedData;
+	public $legacyEncryptedDataKey;
+	public $legacyKey;
+	public $stateFilesTrashbin;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, true);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
+	}
+
+
+	function setUp() {
+		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+		$this->userId = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
+		$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
+
+		// set content for encrypting / decrypting in tests
+		$this->dataUrl = realpath(dirname(__FILE__) . '/../lib/crypt.php');
+		$this->dataShort = 'hats';
+		$this->dataLong = file_get_contents(realpath(dirname(__FILE__) . '/../lib/crypt.php'));
+		$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';
+
+		$keypair = Encryption\Crypt::createKeypair();
+
+		$this->genPublicKey = $keypair['publicKey'];
+		$this->genPrivateKey = $keypair['privateKey'];
+
+		$this->publicKeyDir = '/' . 'public-keys';
+		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
+		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+		$this->publicKeyPath =
+			$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+		$this->privateKeyPath =
+			$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+
+		$this->view = new \OC_FilesystemView('/');
+
+		$this->util = new Encryption\Util($this->view, $this->userId);
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+	}
+
+	/**
+	 * @brief test that paths set during User construction are correct
+	 */
+	function testKeyPaths() {
+		$util = new Encryption\Util($this->view, $this->userId);
+
+		$this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
+		$this->assertEquals($this->encryptionDir, $util->getPath('encryptionDir'));
+		$this->assertEquals($this->keyfilesPath, $util->getPath('keyfilesPath'));
+		$this->assertEquals($this->publicKeyPath, $util->getPath('publicKeyPath'));
+		$this->assertEquals($this->privateKeyPath, $util->getPath('privateKeyPath'));
+
+	}
+
+	/**
+	 * @brief test setup of encryption directories
+	 */
+	function testSetupServerSide() {
+		$this->assertEquals(true, $this->util->setupServerSide($this->pass));
+	}
+
+	/**
+	 * @brief test checking whether account is ready for encryption,
+	 */
+	function testUserIsReady() {
+		$this->assertEquals(true, $this->util->ready());
+	}
+
+	/**
+	 * @brief test checking whether account is not ready for encryption,
+	 */
+//	function testUserIsNotReady() {
+//		$this->view->unlink($this->publicKeyDir);
+//
+//		$params['uid'] = $this->userId;
+//		$params['password'] = $this->pass;
+//		$this->assertFalse(OCA\Encryption\Hooks::login($params));
+//
+//		$this->view->unlink($this->privateKeyPath);
+//	}
+
+	/**
+	 * @brief test checking whether account is not ready for encryption,
+	 */
+	function testIsLegacyUser() {
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+		$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+		$userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		$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->assertTrue(OCA\Encryption\Hooks::login($params));
+
+		$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
+	}
+
+	function testRecoveryEnabledForUser() {
+
+		$util = new Encryption\Util($this->view, $this->userId);
+
+		// Record the value so we can return it to it's original state later
+		$enabled = $util->recoveryEnabledForUser();
+
+		$this->assertTrue($util->setRecoveryForUser(1));
+
+		$this->assertEquals(1, $util->recoveryEnabledForUser());
+
+		$this->assertTrue($util->setRecoveryForUser(0));
+
+		$this->assertEquals(0, $util->recoveryEnabledForUser());
+
+		// Return the setting to it's previous state
+		$this->assertTrue($util->setRecoveryForUser($enabled));
+
+	}
+
+	function testGetUidAndFilename() {
+
+		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+
+		$filename = 'tmp-' . time() . '.test';
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
+
+		// Re-enable proxy - our work is done
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		$util = new Encryption\Util($this->view, $this->userId);
+
+		list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
+
+		$this->assertEquals(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
+
+		$this->assertEquals($file, $filename);
+
+		$this->view->unlink($this->userId . '/files/' . $filename);
+	}
+
+	function testIsSharedPath() {
+		$sharedPath = '/user1/files/Shared/test';
+		$path = '/user1/files/test';
+
+		$this->assertTrue($this->util->isSharedPath($sharedPath));
+
+		$this->assertFalse($this->util->isSharedPath($path));
+	}
+
+	function testEncryptLegacyFiles() {
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
+		$userView = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+		$view = new \OC_FilesystemView('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files');
+
+		// Disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		$encryptionKeyContent = file_get_contents($this->legacyEncryptedDataKey);
+		$userView->file_put_contents('/encryption.key', $encryptionKeyContent);
+
+		$legacyEncryptedData = file_get_contents($this->legacyEncryptedData);
+		$view->mkdir('/test/');
+		$view->mkdir('/test/subtest/');
+		$view->file_put_contents('/test/subtest/legacy-encrypted-text.txt', $legacyEncryptedData);
+
+		$fileInfo = $view->getFileInfo('/test/subtest/legacy-encrypted-text.txt');
+		$fileInfo['encrypted'] = true;
+		$view->putFileInfo('/test/subtest/legacy-encrypted-text.txt', $fileInfo);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		$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->assertTrue(OCA\Encryption\Hooks::login($params));
+
+		$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
+
+		$files = $util->findEncFiles('/' . \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER . '/files/');
+
+		$this->assertTrue(is_array($files));
+
+		$found = false;
+		foreach ($files['encrypted'] as $encryptedFile) {
+			if ($encryptedFile['name'] === 'legacy-encrypted-text.txt') {
+				$found = true;
+				break;
+			}
+		}
+
+		$this->assertTrue($found);
+	}
+
+	/**
+	 * @param $user
+	 * @param bool $create
+	 * @param bool $password
+	 */
+	public static function loginHelper($user, $create = false, $password = false) {
+		if ($create) {
+			\OC_User::createUser($user, $user);
+		}
+
+		if ($password === false) {
+			$password = $user;
+		}
+
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		\OC\Files\Filesystem::tearDown();
+		\OC_Util::setupFS($user);
+		\OC_User::setUserId($user);
+
+		$params['uid'] = $user;
+		$params['password'] = $password;
+		OCA\Encryption\Hooks::login($params);
+	}
+}
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
new file mode 100755
index 0000000000000000000000000000000000000000..1d406789f0c1ac0b1bc1aa9a4d5c8d9efbae4d5e
--- /dev/null
+++ b/apps/files_encryption/tests/webdav.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Florin Peter
+ * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../lib/base.php');
+require_once realpath(dirname(__FILE__) . '/../lib/crypt.php');
+require_once realpath(dirname(__FILE__) . '/../lib/keymanager.php');
+require_once realpath(dirname(__FILE__) . '/../lib/proxy.php');
+require_once realpath(dirname(__FILE__) . '/../lib/stream.php');
+require_once realpath(dirname(__FILE__) . '/../lib/util.php');
+require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
+require_once realpath(dirname(__FILE__) . '/util.php');
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Webdav
+ * @brief this class provide basic webdav tests for PUT,GET and DELETE
+ */
+class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_WEBDAV_USER1 = "test-webdav-user1";
+
+	public $userId;
+	public $pass;
+	/**
+	 * @var \OC_FilesystemView
+	 */
+	public $view;
+	public $dataShort;
+	public $stateFilesTrashbin;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerUserHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
+	}
+
+	function setUp() {
+		// reset backend
+		\OC_User::useBackend('database');
+
+		// set user id
+		\OC_User::setUserId(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+		$this->userId = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
+		$this->pass = \Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1;
+
+		// init filesystem view
+		$this->view = new \OC_FilesystemView('/');
+
+		// init short data
+		$this->dataShort = 'hats';
+
+		// remember files_trashbin state
+		$this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin');
+
+		// we don't want to tests with app files_trashbin enabled
+		\OC_App::disable('files_trashbin');
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+	}
+
+	function tearDown() {
+		// reset app files_trashbin
+		if ($this->stateFilesTrashbin) {
+			OC_App::enable('files_trashbin');
+		}
+		else {
+			OC_App::disable('files_trashbin');
+		}
+	}
+
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+	}
+
+	/**
+	 * @brief test webdav put random file
+	 */
+	function testWebdavPUT() {
+
+		// generate filename
+		$filename = '/tmp-' . time() . '.txt';
+
+		// set server vars
+		$_SERVER['REQUEST_METHOD'] = 'OPTIONS';
+
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
+		$_SERVER['CONTENT_TYPE'] = 'application/octet-stream';
+		$_SERVER['PATH_INFO'] = '/webdav' . $filename;
+		$_SERVER['CONTENT_LENGTH'] = strlen($this->dataShort);
+
+		// handle webdav request
+		$this->handleWebdavRequest($this->dataShort);
+
+		// check if file was created
+		$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+		// check if key-file was created
+		$this->assertTrue($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
+
+		// check if shareKey-file was created
+		$this->assertTrue($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
+
+		// disable encryption proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		// get encrypted file content
+		$encryptedContent = $this->view->file_get_contents('/' . $this->userId . '/files' . $filename);
+
+		// restore proxy state
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		// check if encrypted content is valid
+		$this->assertTrue(Encryption\Crypt::isCatfileContent($encryptedContent));
+
+		// get decrypted file contents
+		$decrypt = file_get_contents('crypt://' . $filename);
+
+		// check if file content match with the written content
+		$this->assertEquals($this->dataShort, $decrypt);
+
+		// return filename for next test
+		return $filename;
+	}
+
+	/**
+	 * @brief test webdav get random file
+	 *
+	 * @depends testWebdavPUT
+	 */
+	function testWebdavGET($filename) {
+
+		// set server vars
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
+		$_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+		// handle webdav request
+		$content = $this->handleWebdavRequest();
+
+		// check if file content match with the written content
+		$this->assertEquals($this->dataShort, $content);
+
+		// return filename for next test
+		return $filename;
+	}
+
+	/**
+	 * @brief test webdav delete random file
+	 * @depends testWebdavGET
+	 */
+	function testWebdavDELETE($filename) {
+		// set server vars
+		$_SERVER['REQUEST_METHOD'] = 'DELETE';
+		$_SERVER['REQUEST_URI'] = '/remote.php/webdav' . $filename;
+		$_SERVER['HTTP_AUTHORIZATION'] = 'Basic dGVzdC13ZWJkYXYtdXNlcjE6dGVzdC13ZWJkYXYtdXNlcjE=';
+		$_SERVER['PATH_INFO'] = '/webdav' . $filename;
+
+		// handle webdav request
+		$content = $this->handleWebdavRequest();
+
+		// check if file was removed
+		$this->assertFalse($this->view->file_exists('/' . $this->userId . '/files' . $filename));
+
+		// check if key-file was removed
+		$this->assertFalse($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
+
+		// check if shareKey-file was removed
+		$this->assertFalse($this->view->file_exists(
+			'/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
+	}
+
+	/**
+	 * @brief handle webdav request
+	 *
+	 * @param bool $body
+	 *
+	 * @note this init procedure is copied from /apps/files/appinfo/remote.php
+	 */
+	function handleWebdavRequest($body = false) {
+		// Backends
+		$authBackend = new OC_Connector_Sabre_Auth();
+		$lockBackend = new OC_Connector_Sabre_Locks();
+		$requestBackend = new OC_Connector_Sabre_Request();
+
+		// Create ownCloud Dir
+		$publicDir = new OC_Connector_Sabre_Directory('');
+
+		// Fire up server
+		$server = new Sabre_DAV_Server($publicDir);
+		$server->httpRequest = $requestBackend;
+		$server->setBaseUri('/remote.php/webdav/');
+
+		// Load plugins
+		$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
+		$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
+		$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+		$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
+		$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
+
+		// And off we go!
+		if ($body) {
+			$server->httpRequest->setBody($body);
+		}
+
+		// turn on output buffering
+		ob_start();
+
+		// handle request
+		$server->exec();
+
+		// file content is written in the output buffer
+		$content = ob_get_contents();
+
+		// flush the output buffer and turn off output buffering
+		ob_end_clean();
+
+		// return captured content
+		return $content;
+	}
+}
\ No newline at end of file
diff --git a/apps/files_encryption/test/zeros b/apps/files_encryption/tests/zeros
similarity index 100%
rename from apps/files_encryption/test/zeros
rename to apps/files_encryption/tests/zeros
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 06837d5085c7e2607125d7b42be994a6812ae0cc..a53bfe48bc3c82a5f1659537d337390903c6f136 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Groups" => "مجموعات",
 "Users" => "المستخدمين",
-"Delete" => "حذف"
+"Delete" => "إلغاء"
 );
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index 66ad4a879d441a038c6c5f79359fccc22a613024..fcb01152bf83135b17bf3821c411c4a70cf38bfb 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -2,6 +2,7 @@
 "Access granted" => "Достъпът е даден",
 "Grant access" => "Даване на достъп",
 "External Storage" => "Външно хранилище",
+"Folder name" => "Име на папката",
 "Configuration" => "Конфигурация",
 "Options" => "Опции",
 "Applicable" => "Приложимо",
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 07ccd50074667723f638cc89f7c04d82f9246cfe..0f032df9f05782566bf6f92f82a3dcb02a6fe6c9 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -12,7 +12,7 @@
 "All Users" => "সমস্ত ব্যবহারকারী",
 "Groups" => "গোষ্ঠীসমূহ",
 "Users" => "ব্যবহারকারী",
-"Delete" => "মুছে ফেল",
+"Delete" => "মুছে",
 "Enable User External Storage" => "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর",
 "Allow users to mount their own external storage" => "ব্যবহারকারীদেরকে তাদের নিজস্ব বাহ্যিক সংরক্ষনাগার  সাউন্ট করতে অনুমোদন দাও",
 "SSL root certificates" => "SSL  রুট সনদপত্র",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index aa9304d3301a234835b4cdf0291e8a31a0682632..90ac954301f827110222c7abf00c5187e97c00fb 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament 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>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li.",
 "<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>Avís:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li.",
+"<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>Avís:</b>El suport Curl de PHP no està activat o instal·lat. No es pot muntar ownCloud / WebDAV o GoogleDrive. Demaneu a l'administrador que l'instal·li.",
 "External Storage" => "Emmagatzemament extern",
 "Folder name" => "Nom de la carpeta",
 "External storage" => "Emmagatzemament extern",
@@ -17,7 +18,7 @@
 "All Users" => "Tots els usuaris",
 "Groups" => "Grups",
 "Users" => "Usuaris",
-"Delete" => "Elimina",
+"Delete" => "Esborra",
 "Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
 "Allow users to mount their own external storage" => "Permet als usuaris muntar el seu emmagatzemament extern propi",
 "SSL root certificates" => "Certificats SSL root",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 20bbe8acbaaf42d5b7f3e35b1f92481fcd14bbe1..12603044d63ee36907d3bf21af1829eec5084957 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Chyba při nastavení úložiště 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>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje.",
 "<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>Varování:</b> není nainstalována, nebo povolena, podpora FTP v PHP. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje.",
+"<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>Varování:</b> není nainstalována, nebo povolena, podpora Curl v PHP. Není možné připojení oddílů ownCloud, WebDAV, či GoogleDrive. Prosím požádejte svého správce systému ať ji nainstaluje.",
 "External Storage" => "Externí úložiště",
 "Folder name" => "Název složky",
 "External storage" => "Externí úložiště",
diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..78bbb987eb89093f6cd7b433b0db498071696f8e
--- /dev/null
+++ b/apps/files_external/l10n/cy_GB.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Grwpiau",
+"Users" => "Defnyddwyr",
+"Delete" => "Dileu"
+);
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
index c1c070e3d7fcba07b9014f2dd9c68a75187358d3..f2c1e45778d34c42f15eb8c7ac220c73025cee0d 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive plads",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
 "<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> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
+"<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>Advarsel:</b> Understøttelsen for Curl i PHP er enten ikke aktiveret eller ikke installeret. Det er ikke muligt, at montere ownCloud / WebDAV eller GoogleDrive. Spørg din system administrator om at installere det. ",
 "External Storage" => "Ekstern opbevaring",
 "Folder name" => "Mappenavn",
 "External storage" => "Eksternt lager",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index 24183772217a0d59ce1b14f7569b5ac653319aef..8dfa0eafbb4b037fa9910a93f0223bb1651f2ee4 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Fehler beim Einrichten von 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>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren.",
 "<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>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator.",
+"<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>Warnung:</b> Die Curl-Unterstützung in PHP ist nicht aktiviert oder installiert. Das Einbinden von ownCloud / WebDav der GoogleDrive-Freigaben ist nicht möglich. Bitte Deinen Systemadminstrator um die Installation. ",
 "External Storage" => "Externer Speicher",
 "Folder name" => "Ordnername",
 "External storage" => "Externer Speicher",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index d55c0c6909de06d2c5b26b5fe74ef97e4c4ee181..9b7ab4d53ca80523d2dee4b7f998aa83e14c14f7 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Fehler beim Einrichten von 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>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
 "<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>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
+"<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>Achtung:</b> Die Curl-Unterstützung  von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.",
 "External Storage" => "Externer Speicher",
 "Folder name" => "Ordnername",
 "External storage" => "Externer Speicher",
@@ -19,7 +20,7 @@
 "Users" => "Benutzer",
 "Delete" => "Löschen",
 "Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 6c519a1b413bd8705f48841df49bcb40ce80fe90..62703b08fbc1422f2b7b9b95bd65643009da7825 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.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> Ο \"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> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση 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> Η υποστήριξη του συστήματος Curl στο PHP δεν είναι ενεργοποιημένη ή εγκαταστημένη. Η αναπαραγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. Παρακαλώ ρωτήστε τον διαχειριστλη του συστήματος για την εγκατάσταση. ",
 "External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
 "Folder name" => "Όνομα φακέλου",
 "External storage" => "Εξωτερική αποθήκευση",
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index da22f41032070f52d6f585874e05fe778d487319..f83562dd643e2b491c219639689e8650da4b7f28 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Error configurando 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 en PHP no está activado ni instalado. El montado de  ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
@@ -17,7 +18,7 @@
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
-"Delete" => "Eliiminar",
+"Delete" => "Eliminar",
 "Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
 "Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
 "SSL root certificates" => "Raíz de certificados SSL  ",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 5d1eb0887ba18ec49ae4bc5f94f34db329f5c931..465201df4dd3834a40f41c088ca9f7a2c1ce1199 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -5,7 +5,8 @@
 "Please provide a valid Dropbox app key and secret." => "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
 "Error configuring Google Drive storage" => "Viga Google Drive'i salvestusruumi seadistamisel",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi.",
-"<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>Hoiatus:</b> FTP tugi puudub PHP paigalduses. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
+"<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>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
+"<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>Hoiatus:</b> PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada.",
 "External Storage" => "Väline salvestuskoht",
 "Folder name" => "Kausta nimi",
 "External storage" => "Väline andmehoidla",
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 2f7d65fbe9caacb9610abadcede8627cef3aaefc..ba39d140fbc87f922ee3e02fd645ac34168fa6f8 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Virhe Google Drive levyn asetuksia tehtäessä",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan smbclient.",
 "<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>Varoitus:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. FTP-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
+"<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>Varoitus:</b> PHP:n Curl-tuki ei ole käytössä tai sitä ei ole lainkaan asennettu. ownCloudin, WebDAV:in tai Google Driven liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan Curl-tuki käyttöön.",
 "External Storage" => "Erillinen tallennusväline",
 "Folder name" => "Kansion nimi",
 "External storage" => "Ulkoinen tallennustila",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index c42c89f8572e6eaec912951b5a872cccba978146..5006133a7b688cc4e59bb84d097a777acc5ac7ec 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage 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>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer.",
 "<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>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.",
+"<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>Attention :</b> Le support de Curl n'est pas activé ou installé dans PHP. Le montage de ownCloud / WebDAV ou GoogleDrive n'est pas possible. Contactez votre administrateur système pour l'installer.",
 "External Storage" => "Stockage externe",
 "Folder name" => "Nom du dossier",
 "External storage" => "Stockage externe",
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 715417e25a0d96dde674f0cec29d1ce6fbe24bb6..77f23c39bc3f95b1c37bd7c5cfc2b4d6708f7559 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Produciuse un erro ao configurar o almacenamento en 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>Aviso:</b> «smbclient» non está instalado. Non é posibel a montaxe de comparticións CIFS/SMB. Consulte co administrador do sistema para instalalo.",
 "<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>Aviso:</b> A compatibilidade de FTP en PHP non está activada ou instalada. Non é posibel a montaxe de comparticións FTP. Consulte co administrador do sistema para instalalo.",
+"<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>Aviso:</ b> A compatibilidade de Curl en PHP non está activada ou instalada. Non é posíbel a montaxe de ownCloud / WebDAV ou GoogleDrive. Consulte co administrador do sistema para instalala.",
 "External Storage" => "Almacenamento externo",
 "Folder name" => "Nome do cartafol",
 "External storage" => "Almacenamento externo",
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index 9ecd2d1088b7a0d348409b470ee196c2d4c52309..b88737a19abde8df8d97c60f132795cc2f4c8d30 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "A Google Drive tárolót nem sikerült beállítani",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Figyelem:</b> az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot.",
 "<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>Figyelem:</b> a PHP FTP támogatása vagy nincs telepítve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot.",
+"<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>Figyelmeztetés:</b> A PHP-ben nincs telepítve vagy engedélyezve a Curl támogatás. Nem lehetséges ownCloud / WebDAV ill. GoogleDrive tárolók becsatolása. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot!",
 "External Storage" => "Külső tárolási szolgáltatások becsatolása",
 "Folder name" => "Mappanév",
 "External storage" => "Külső tárolók",
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index d7e0c81a0b0b6e0f23f4fbb9c2e4dea96774d88a..4c70a04022ecba70b8b9845d10047a256a8c5dcb 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Errore durante la configurazione dell'archivio 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>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo.",
 "<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>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo.",
+"<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>Avviso:</b> il supporto Curl di PHP non è abilitato o non è installato. Impossibile montare condivisioni ownCloud / WebDAV o GoogleDrive. Chiedi all'amministratore di sistema di installarlo.",
 "External Storage" => "Archiviazione esterna",
 "Folder name" => "Nome della cartella",
 "External storage" => "Archiviazione esterna",
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index 12a0b30938a5e668377371ead59d07e9005451fa..97dd4e119d4d9fdecdbe1bc41dfac60d830bdcfd 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -6,6 +6,7 @@
 "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 もしくは GoogleDrive のマウントはできません。システム管理者にインストールをお願いして下さい。",
 "External Storage" => "外部ストレージ",
 "Folder name" => "フォルダ名",
 "External storage" => "外部ストレージ",
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index d10f82849dc2d932a1eee74985b4a81bbf627a83..b0845555b4b41d6d46b76cffb628dd6b61ee37af 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.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> \"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>  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 ან GoogleDrive–ის მონტირება შეუძლებელია. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის.",
 "External Storage" => "ექსტერნალ საცავი",
 "Folder name" => "ფოლდერის სახელი",
 "External storage" => "ექსტერნალ საცავი",
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
index 2a62cad3fe90c3a6e2e97a7de790f5faf8ef0958..4e78227ec4854d4d7281a9fc69199347bde8c6f1 100644
--- a/apps/files_external/l10n/lb.php
+++ b/apps/files_external/l10n/lb.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Folder name" => "Dossiers Numm:",
 "Groups" => "Gruppen",
+"Users" => "Benotzer",
 "Delete" => "Läschen"
 );
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 9bf997d87cb8d0a21a79ba115c6d2993d483549c..29c962d9a8057b2898921ce6113494c5b9b5ac76 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Klaida nustatinÄ—jant Google Drive talpyklÄ…",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Įspėjimas:</b> \"smbclient\" nėra įdiegtas. CIFS/SMB dalinimasis nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas \"smbclient\"",
 "<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>Įspėjimas:</b> FTP palaikymas PHP sistemoje nėra įjungtas arba nėra įdiegtas.  FTP dalinimosi įjungimas nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas FTP palaikymas. ",
+"<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>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas.",
 "External Storage" => "IÅ¡orinÄ—s saugyklos",
 "Folder name" => "Katalogo pavadinimas",
 "External storage" => "IÅ¡orinÄ— saugykla",
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index 961ef2b1046bb8833751b47be4a337f77c761371..ea8648303d1be23bec5c75f626e4f1f5ccaf63ec 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -2,6 +2,11 @@
 "Access granted" => "Tilgang innvilget",
 "Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
 "Grant access" => "Gi tilgang",
+"Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+"Error configuring Google Drive storage" => "Feil med 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>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det.",
+"<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>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det.",
+"<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>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det.",
 "External Storage" => "Ekstern lagring",
 "Folder name" => "Mappenavn",
 "External storage" => "Ekstern lagringsplass",
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index ad3eda9747fe44c0dda8ef59b8e433a807598ee1..ded5a861a8b50ca0509b0dce2ceb65b97c96715e 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren.",
 "<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>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
+"<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>Waarschuwing:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van ownCloud / WebDAV of GoogleDrive is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
 "External Storage" => "Externe opslag",
 "Folder name" => "Mapnaam",
 "External storage" => "Externe opslag",
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
index 4b4b6167d88628cfae7ace8305001b3a06cc31b7..998c3f824578b5d2553d84eecd777aff27a8c4ff 100644
--- a/apps/files_external/l10n/nn_NO.php
+++ b/apps/files_external/l10n/nn_NO.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Configuration" => "Innstillingar",
 "Groups" => "Grupper",
 "Users" => "Brukarar",
 "Delete" => "Slett"
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index cd1b1fe84a1f4145a50bd3ba44a5b9d7c68c11f3..e03ded1e70a222268880990d6d7fc2339755e9e4 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu 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>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
 "<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>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
+"<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>Ostrzeżenie:</b> Wsparcie dla  Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji.",
 "External Storage" => "Zewnętrzna zasoby dyskowe",
 "Folder name" => "Nazwa folderu",
 "External storage" => "Zewnętrzne zasoby dyskowe",
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index a358d56913916cff5bdeddc883acf765aba20a30..bc3c356a5175f89f4d93437da084f4b67376aa4b 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Erro ao configurar armazenamento do 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>Aviso:</b> \"smbclient\" não está instalado. Impossível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo.",
 "<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>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. Impossível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+"<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> Aviso: </b> O suport a Curl em PHP não está habilitado ou instalado. A montagem do ownCloud / WebDAV ou GoogleDrive não é possível. Por favor, solicite ao seu administrador do sistema instalá-lo.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
 "External storage" => "Armazenamento Externo",
@@ -17,7 +18,7 @@
 "All Users" => "Todos os Usuários",
 "Groups" => "Grupos",
 "Users" => "Usuários",
-"Delete" => "Remover",
+"Delete" => "Excluir",
 "Enable User External Storage" => "Habilitar Armazenamento Externo do Usuário",
 "Allow users to mount their own external storage" => "Permitir usuários a montar seus próprios armazenamentos externos",
 "SSL root certificates" => "Certificados SSL raíz",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index aac3c1c2ca0779e1ca00f13a17a6d3fd986e82e0..0a05d1f8825fb3654dae7470c8b54616aa82dcf6 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do 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>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
 "<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>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
+"<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>Atenção:<br> O suporte PHP para o Curl não está activado ou instalado. A montagem do ownCloud/WebDav ou GoolgeDriver não é possível. Por favor contacte o administrador para o instalar.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
 "External storage" => "Armazenamento Externo",
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index 5747205dc0590730806b6e5a0bff56918f86dc26..ed23b4cca8f7c52266f92e96603956a8bd59eb9b 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Eroare la configurarea mediului de stocare 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>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze.",
 "<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>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze.",
+"<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>Atentie:</b> Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!",
 "External Storage" => "Stocare externă",
 "Folder name" => "Denumire director",
+"External storage" => "Stocare externă",
 "Configuration" => "Configurație",
 "Options" => "Opțiuni",
 "Applicable" => "Aplicabil",
+"Add storage" => "Adauga stocare",
 "None set" => "Niciunul",
 "All Users" => "Toți utilizatorii",
 "Groups" => "Grupuri",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 46b73a67f046d8bc53d8eaf4c29d0e5500821ff7..d2c5292bac414da45f92ca36d928ff3ff087d238 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.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> \"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> Поддержка FTP не включена в PHP. Подключение по 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> Поддержка Curl в PHP не включена или не установлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. Попросите вашего системного администратора установить его.",
 "External Storage" => "Внешний носитель",
 "Folder name" => "Имя папки",
 "External storage" => "Внешний носитель данных",
diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php
index 406e284b2781734bdcdde8fb67bf3c99845057a9..a43417dfbc1a134a783914c108680fa888d81f06 100644
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@@ -1,23 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Access granted" => "Доступ разрешен",
-"Error configuring Dropbox storage" => "Ошибка при конфигурировании хранилища Dropbox",
-"Grant access" => "Предоставить доступ",
-"Please provide a valid Dropbox app key and secret." => "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль.",
-"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> \"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> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее.",
-"External Storage" => "Внешние системы хранения данных",
-"Folder name" => "Имя папки",
-"Configuration" => "Конфигурация",
-"Options" => "Опции",
-"Applicable" => "Применимый",
-"None set" => "Не задан",
-"All Users" => "Все пользователи",
 "Groups" => "Группы",
-"Users" => "Пользователи",
-"Delete" => "Удалить",
-"Enable User External Storage" => "Включить пользовательскую внешнюю систему хранения данных",
-"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных",
-"SSL root certificates" => "Корневые сертификаты SSL",
-"Import Root Certificate" => "Импортировать корневые сертификаты"
+"Delete" => "Удалить"
 );
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index af6b7b4ae6e2bb3fd4a6489735f0c7fda3ca8b4d..33edcb9d4c8c112202b001263ff202486b01156e 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Chyba pri konfigurácii úložiska 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>Upozornenie:</b> \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje.",
 "<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>Upozornenie:</b> Podpora FTP v PHP nie je povolená alebo nainštalovaná. Nie je možné pripojenie oddielov FTP. Požiadajte administrátora systému, nech ho nainštaluje.",
+"<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>Varovanie:</b> nie je nainštalovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, či GoogleDrive. Prosím požiadajte svojho administrátora systému, nech ju nainštaluje.",
 "External Storage" => "Externé úložisko",
 "Folder name" => "Meno priečinka",
 "External storage" => "Externé úložisko",
@@ -17,7 +18,7 @@
 "All Users" => "Všetci používatelia",
 "Groups" => "Skupiny",
 "Users" => "Používatelia",
-"Delete" => "Odstrániť",
+"Delete" => "Zmazať",
 "Enable User External Storage" => "Povoliť externé úložisko",
 "Allow users to mount their own external storage" => "Povoliť používateľom pripojiť ich vlastné externé úložisko",
 "SSL root certificates" => "Koreňové SSL certifikáty",
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index 4ff2eed3bf0de9dc2ae984ce7ff2ddd182438331..09b91b913e9a796899b1b8b96d7756939b5e8814 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -5,7 +5,8 @@
 "Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
 "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe 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>Opozorilo:</b> paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče.",
-"<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>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče.",
+"<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>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ne bo mogoče.",
+"<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>Opozorilo:</b> podpora za Curl v PHP ni omogočena ali pa ni nameščena. Priklapljanje točke ownCloud / WebDAV ali GoogleDrive zato ne bo mogoče. Zahtevane pakete je treba pred uporabo namestiti.",
 "External Storage" => "Zunanja podatkovna shramba",
 "Folder name" => "Ime mape",
 "External storage" => "Zunanja shramba",
@@ -18,7 +19,7 @@
 "Groups" => "Skupine",
 "Users" => "Uporabniki",
 "Delete" => "Izbriši",
-"Enable User External Storage" => "Omogoči uporabniško zunanjo podatkovno shrambo",
+"Enable User External Storage" => "Omogoči zunanjo uporabniško podatkovno shrambo",
 "Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe",
 "SSL root certificates" => "Korenska potrdila SSL",
 "Import Root Certificate" => "Uvozi korensko potrdilo"
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 79dc3a85893472b9264eecccb72b1ad1a853af2a..3c3c0c24f97ad6baa6c8529f8272b5aed44ff0b1 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -4,6 +4,9 @@
 "Grant access" => "Erişim sağlandı",
 "Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz",
 "Error configuring Google Drive storage" => "Google Drive depo yapılandırma hatası",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Uyari.</b>''smbclient''yüklü değil. Mont etme CIFS/SMB hissenin mümkün değildir. Lutfen kullanici sistemin sormak onu yuklemek ici,  ",
+"<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." => "<Uyari.</b>. Sistem FTP PHPden aktif degil veya yuklemedi. Monte etme hissenin FTP mumkun degildir. Lutfen kullaniici sistemin sormak onu yuklemek icin.",
+"<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> Ihbar </b>. Dayanma Curl PHPden aktif veya yuklemedi degil. Monte ownClouden/WebDay veya GoogleDrive mumkun degil. Lutfen sistm yonetici sormak yuklemek icin. ",
 "External Storage" => "Harici Depolama",
 "Folder name" => "Dizin ismi",
 "External storage" => "Harici Depolama",
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d1dea989063c0cc93a38882d4c7303f60e6ae1e
--- /dev/null
+++ b/apps/files_external/l10n/ug.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Folder name" => "قىسقۇچ ئاتى",
+"External storage" => "سىرتقى ساقلىغۇچ",
+"Configuration" => "سەپلىمە",
+"Options" => "تاللانما",
+"Groups" => "گۇرۇپپا",
+"Users" => "ئىشلەتكۈچىلەر",
+"Delete" => "ئۆچۈر"
+);
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index 84f31e88924a8fafd610a0e98f68077b778406ad..769f9e2a0976aa443ffda271da4e10fe6de52959 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Lỗi cấu hình lưu trữ 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>Cảnh báo:</b> \"smbclient\" chưa được cài đặt. Mount CIFS/SMB shares là không thể thực hiện được. Hãy hỏi người quản trị hệ thống để cài đặt nó.",
 "<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>Cảnh báo:</b> FTP trong PHP chưa được cài đặt hoặc chưa được  mở. Mount FTP shares là không thể. Xin hãy yêu cầu quản trị hệ thống của bạn cài đặt nó.",
+"<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>Cảnh báo:</b> Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó.",
 "External Storage" => "Lưu trữ ngoài",
 "Folder name" => "Tên thư mục",
+"External storage" => "Lưu trữ ngoài",
 "Configuration" => "Cấu hình",
 "Options" => "Tùy chọn",
 "Applicable" => "Áp dụng",
+"Add storage" => "Thêm bộ nhớ",
 "None set" => "không",
 "All Users" => "Tất cả người dùng",
 "Groups" => "Nhóm",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 7f95320511f99a165e7d3c8cbbf60465e4c502ef..8157923183cc92a1909a3b06cb7c28b1c8ec2089 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.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>“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 或 GoogleDrive 不能挂载。请请求您的系统管理员安装该它。",
 "External Storage" => "外部存储",
 "Folder name" => "目录名称",
 "External storage" => "外部存储",
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index 873b555348e546bf356cd71c9cf755d185f79e7b..a8314dcef03660b8b3ecd734b66c340f5fb3c610 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -1,16 +1,26 @@
 <?php $TRANSLATIONS = array(
-"Access granted" => "訪問權已被准許",
-"Grant access" => "准許訪問權",
-"External Storage" => "外部儲存裝置",
+"Access granted" => "允許存取",
+"Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤",
+"Grant access" => "允許存取",
+"Please provide a valid Dropbox app key and secret." => "請提供有效的 Dropbox app key 和 app secret 。",
+"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>：未安裝 \"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 Drive 分享，請洽您的系統管理員將其安裝並啓用。",
+"External Storage" => "外部儲存",
 "Folder name" => "資料夾名稱",
-"External storage" => "外部儲存裝置",
+"External storage" => "外部儲存",
 "Configuration" => "設定",
 "Options" => "選項",
-"Add storage" => "添加儲存區",
+"Applicable" => "可用的",
+"Add storage" => "增加儲存區",
 "None set" => "尚未設定",
 "All Users" => "所有使用者",
 "Groups" => "群組",
 "Users" => "使用者",
 "Delete" => "刪除",
+"Enable User External Storage" => "啓用使用者外部儲存",
+"Allow users to mount their own external storage" => "允許使用者自行掛載他們的外部儲存",
+"SSL root certificates" => "SSL 根憑證",
 "Import Root Certificate" => "匯入根憑證"
 );
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 01462cb6f8522d62500adeb7288303896d29df2b..4cb9b7c8ecdc4751b24a3828a5b9b1bd769a740c 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -70,7 +70,7 @@ class OC_Mount_Config {
 				'root' => '&Root',
 				'secure' => '!Secure ftps://'));
 
-		$backends['\OC\Files\Storage\Google']=array(
+		if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\Google']=array(
 			'backend' => 'Google Drive',
 			'configuration' => array(
 				'configured' => '#configured',
@@ -96,7 +96,7 @@ class OC_Mount_Config {
 				'share' => 'Share',
 				'root' => '&Root'));
 
-		$backends['\OC\Files\Storage\DAV']=array(
+		if(OC_Mount_Config::checkcurl()) $backends['\OC\Files\Storage\DAV']=array(
 			'backend' => 'ownCloud / WebDAV',
 			'configuration' => array(
 				'host' => 'URL',
@@ -414,6 +414,13 @@ class OC_Mount_Config {
 		}
 	}
 
+	/**
+	 * check if curl is installed
+	 */
+	public static function checkcurl() {
+		return (function_exists('curl_init'));
+	}
+
 	/**
 	 * check dependencies
 	 */
@@ -426,6 +433,9 @@ class OC_Mount_Config {
 		if(!OC_Mount_Config::checkphpftp()) {
 			$txt.=$l->t('<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.').'<br />';
 		}
+		if(!OC_Mount_Config::checkcurl()) {
+			$txt.=$l->t('<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.').'<br />';
+		}
 
 		return($txt);
 	}
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index cb04e557f8a6b2b3c01a26e0a32330bd3c04cd65..081c54788814788ba2d7cd63142dbb08ba103543 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -45,7 +45,6 @@ class Dropbox extends \OC\Files\Storage\Common {
 			$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
 			$this->dropbox = new \Dropbox_API($oauth, 'dropbox');
-			$this->mkdir('');
 		} else {
 			throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed');
 		}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 8a7375ebe38730a270ba74ea1f275543e100fffd..ca6c635eb2b802812e8a3ef43d5dca6538e3760c 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -35,10 +35,6 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 			if ( ! $this->root || $this->root[0]!='/') {
 				$this->root='/'.$this->root;
 			}
-			//create the root folder if necessary
-			if ( ! $this->is_dir('')) {
-				$this->mkdir('');
-			}
 		} else {
 			throw new \Exception();
 		}
@@ -63,7 +59,6 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 		return $url;
 	}
 	public function fopen($path,$mode) {
-		$this->init();
 		switch($mode) {
 			case 'r':
 			case 'rb':
@@ -100,7 +95,6 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 	}
 
 	public function writeBack($tmpFile) {
-		$this->init();
 		if (isset(self::$tempFiles[$tmpFile])) {
 			$this->uploadFile($tmpFile, self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index ede6c251fd9e18463590b04ff7ee72a725c5f536..4fd360964631d652372d454d2097700d2b68d6cf 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -50,10 +50,6 @@ class SFTP extends \OC\Files\Storage\Common {
 			$host_keys[$this->host] = $current_host_key;
 			$this->write_host_keys($host_keys);
 		}
-
-		if(!$this->file_exists('')){
-			$this->mkdir('');
-		}
 	}
 
 	public function test() {
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 961efb1a50a43123a43d299296cbb30d305875c7..81a6c95638591115d7740496e313571fb35bbcf6 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -57,12 +57,22 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 
 	public function stat($path) {
 		if ( ! $path and $this->root=='/') {//mtime doesn't work for shares
-			$mtime=$this->shareMTime();
 			$stat=stat($this->constructUrl($path));
+			if (empty($stat)) {
+				return false;
+			}
+			$mtime=$this->shareMTime();
 			$stat['mtime']=$mtime;
 			return $stat;
 		} else {
-			return stat($this->constructUrl($path));
+			$stat = stat($this->constructUrl($path));
+
+			// smb4php can return an empty array if the connection could not be established
+			if (empty($stat)) {
+				return false;
+			}
+
+			return $stat;
 		}
 	}
 
@@ -73,7 +83,6 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	 * @return bool
 	 */
 	public function hasUpdated($path,$time) {
-		$this->init();
 		if(!$path and $this->root=='/') {
 			// mtime doesn't work for shares, but giving the nature of the backend,
 			// doing a full update is still just fast enough
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index 4685877f26b7ea0bb0d7266bfceb897afa08f809..09041f335b46517a6076edb15f2db942a53aa9fc 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -8,46 +8,28 @@
 
 namespace OC\Files\Storage;
 
-abstract class StreamWrapper extends \OC\Files\Storage\Common{
-	private $ready = false;
-
-	protected function init(){
-		if($this->ready) {
-			return;
-		}
-		$this->ready = true;
-
-		//create the root folder if necesary
-		if(!$this->is_dir('')) {
-			$this->mkdir('');
-		}
-	}
-
+abstract class StreamWrapper extends Common{
 	abstract public function constructUrl($path);
 
 	public function mkdir($path) {
-		$this->init();
 		return mkdir($this->constructUrl($path));
 	}
 
 	public function rmdir($path) {
-		$this->init();
 		if($this->file_exists($path)) {
-			$succes = rmdir($this->constructUrl($path));
+			$success = rmdir($this->constructUrl($path));
 			clearstatcache();
-			return $succes;
+			return $success;
 		} else {
 			return false;
 		}
 	}
 
 	public function opendir($path) {
-		$this->init();
 		return opendir($this->constructUrl($path));
 	}
 
 	public function filetype($path) {
-		$this->init();
 		return filetype($this->constructUrl($path));
 	}
 
@@ -60,24 +42,20 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
 	}
 
 	public function file_exists($path) {
-		$this->init();
 		return file_exists($this->constructUrl($path));
 	}
 
 	public function unlink($path) {
-		$this->init();
-		$succes = unlink($this->constructUrl($path));
+		$success = unlink($this->constructUrl($path));
 		clearstatcache();
-		return $succes;
+		return $success;
 	}
 
 	public function fopen($path, $mode) {
-		$this->init();
 		return fopen($this->constructUrl($path), $mode);
 	}
 
 	public function touch($path, $mtime=null) {
-		$this->init();
 		if(is_null($mtime)) {
 			$fh = $this->fopen($path, 'a');
 			fwrite($fh, '');
@@ -88,22 +66,18 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
 	}
 
 	public function getFile($path, $target) {
-		$this->init();
 		return copy($this->constructUrl($path), $target);
 	}
 
 	public function uploadFile($path, $target) {
-		$this->init();
 		return copy($path, $this->constructUrl($target));
 	}
 
 	public function rename($path1, $path2) {
-		$this->init();
 		return rename($this->constructUrl($path1), $this->constructUrl($path2));
 	}
 
 	public function stat($path) {
-		$this->init();
 		return stat($this->constructUrl($path));
 	}
 
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 68c4b48f17c18ae41562bc9a3f44122517bb10ac..a9cfe5bd20f69807f21a59f4920a38f25a656e80 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -287,6 +287,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 			if ( ! $this->root || $this->root[0]!='/') {
 				$this->root='/'.$this->root;
 			}
+			$this->id = 'swift:' . $this->host . ':'.$this->root . ':' . $this->user;
 		} else {
 			throw new \Exception();
 		}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 3ba7c48cd5742adcabbb94bc831364ee4c2f2ae2..c2fe7c67b582e994f65e60215d797590327665a0 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -73,8 +73,6 @@ class DAV extends \OC\Files\Storage\Common{
 				$this->client->addTrustedCertificates($certPath);
 			}
 		}
-		//create the root folder if necessary
-		$this->mkdir('');
 	}
 
 	public function getId(){
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 923b5e39681bd144a4adb3952d94ee17a92a1276..e146725473ac2bfb3444090a03ebfde58db86836 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -19,6 +19,7 @@ class FTP extends Storage {
 		}
 		$this->config['ftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
 		$this->instance = new \OC\Files\Storage\FTP($this->config['ftp']);
+		$this->instance->mkdir('/');
 	}
 
 	public function tearDown() {
diff --git a/apps/files_external/tests/sftp.php b/apps/files_external/tests/sftp.php
index 16964e208781c34b4d8ecce4d90230496b51c2fe..efea7f075ff20d48d19d4b49a5e68448a023d423 100644
--- a/apps/files_external/tests/sftp.php
+++ b/apps/files_external/tests/sftp.php
@@ -33,6 +33,7 @@ class SFTP extends Storage {
 		}
 		$this->config['sftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
 		$this->instance = new \OC\Files\Storage\SFTP($this->config['sftp']);
+		$this->instance->mkdir('/');
 	}
 
 	public function tearDown() {
@@ -40,4 +41,4 @@ class SFTP extends Storage {
 			$this->instance->rmdir('/');
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index be3ea5a8308baed4a36ecfd70dfce9a04f28ca2e..ca2a93c894449f5584be40d6b996cc339b3aec89 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -20,6 +20,7 @@ class SMB extends Storage {
 		}
 		$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
 		$this->instance = new \OC\Files\Storage\SMB($this->config['smb']);
+		$this->instance->mkdir('/');
 	}
 
 	public function tearDown() {
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 1702898045e772f34da117641a5038a8264dc753..1f9b767eca69d24ca1fff865471972f7c6a79eb6 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -20,6 +20,7 @@ class DAV extends Storage {
 		}
 		$this->config['webdav']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
 		$this->instance = new \OC\Files\Storage\DAV($this->config['webdav']);
+		$this->instance->mkdir('/');
 	}
 
 	public function tearDown() {
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index c3af434ee2934d590c2467400afb792661c9cbc0..5fdf6de50c03fcdc28ec7bf5ca1ccf5b52aaa9f6 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "কূটশব্দ",
-"Submit" => "জমা দাও",
+"Submit" => "জমা দিন",
 "%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
 "%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
 "Download" => "ডাউনলোড",
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..dec9af4ebe988ea63011f4547f9275d5f0afaaa3
--- /dev/null
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Cyfrinair",
+"Submit" => "Cyflwyno",
+"%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
+"%s shared the file %s with you" => "Rhannodd %s ffeil %s â chi",
+"Download" => "Llwytho i lawr",
+"No preview available for" => "Does dim rhagolwg ar gael ar gyfer",
+"web services under your control" => "gwasanaethau gwe a reolir gennych"
+);
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index b92d6d478c9ae99203a0e7fa377742a85a54d067..ab81589b0eb2b1991cec699cfdc79267b17310f7 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Passwort",
-"Submit" => "Absenden",
+"Submit" => "Bestätigen",
 "%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" => "Download",
+"Download" => "Herunterladen",
 "No preview available for" => "Es ist keine Vorschau verfügbar für",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle"
 );
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..02ee8440487e6729fc9f21207d797bc07a4e4b53
--- /dev/null
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Secret Code",
+"Submit" => "Submit",
+"%s shared the folder %s with you" => "%s shared the folder %s with you",
+"%s shared the file %s with you" => "%s shared the file %s with you",
+"Download" => "Download",
+"No preview available for" => "No preview available for",
+"web services under your control" => "web services under your control"
+);
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index ff7be88af87ed7de04c0303ebe1476584e1d9b2f..2ea5ba76ab162e1ec6f7098e77525eb03e9ad128 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Password" => "ססמה",
+"Password" => "סיסמא",
 "Submit" => "שליחה",
 "%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
 "%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
new file mode 100644
index 0000000000000000000000000000000000000000..560df54fc94879dc4a36194c970aa8fc1400a6a7
--- /dev/null
+++ b/apps/files_sharing/l10n/hi.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "पासवर्ड"
+);
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2dca866bbd8e13b7f653e77a8296769ed1f331c
--- /dev/null
+++ b/apps/files_sharing/l10n/hr.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Lozinka",
+"Submit" => "Pošalji",
+"Download" => "Preuzimanje",
+"web services under your control" => "web usluge pod vašom kontrolom"
+);
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..438e8a7433cfde7ccdab2b0e2a3c466fb56a415f
--- /dev/null
+++ b/apps/files_sharing/l10n/hy.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Submit" => "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬",
+"Download" => "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
+);
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
new file mode 100644
index 0000000000000000000000000000000000000000..d229135a71d89304766a4a846e2d073e4eb25e62
--- /dev/null
+++ b/apps/files_sharing/l10n/ia.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Contrasigno",
+"Submit" => "Submitter",
+"Download" => "Discargar",
+"web services under your control" => "servicios web sub tu controlo"
+);
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index f139b0a06438f16c8ae797d1bee15cf9b221ddd2..675fc372e1527a24eadcd2d14e82bc5f5f118bd9 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Password" => "تێپه‌ڕه‌وشه",
+"Password" => "وشەی تێپەربو",
 "Submit" => "ناردن",
 "%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
 "%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index 8aba5806aa03c9ece3e8630f7e065da5a293c302..630866ab4c572cebb05745bc333ff925a9f89470 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Passwuert"
+"Password" => "Passwuert",
+"Submit" => "Fortschécken",
+"Download" => "Download",
+"web services under your control" => "Web Servicer ënnert denger Kontroll"
 );
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index d21a3c14f4044e594080241e97a200c247df5fcf..96ab48cd2c53377218b351872305ea70944de9f8 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Dydis",
-"Modified" => "Pakeista",
-"Delete all" => "IÅ¡trinti viskÄ…",
-"Delete" => "IÅ¡trinti"
+"Password" => "Slaptažodis",
+"Submit" => "IÅ¡saugoti",
+"Download" => "Atsisiųsti",
+"web services under your control" => "jūsų valdomos web paslaugos"
 );
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 0b22486708959b12614f26618fcf016001261683..88faeaf9f11fed7fbf054b1c8ea65970f3be9882 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -5,5 +5,5 @@
 "%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" => "jūsu vadībā esošie tīmekļa servisi"
+"web services under your control" => "tīmekļa servisi tavā varā"
 );
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
new file mode 100644
index 0000000000000000000000000000000000000000..879524afce3cc02d199e80fb415e05c7d05df3b1
--- /dev/null
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Kata laluan",
+"Submit" => "Hantar",
+"Download" => "Muat turun",
+"web services under your control" => "Perkhidmatan web di bawah kawalan anda"
+);
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..aeba545dabc1d1a634b989fbbe5274ef680e7b4e
--- /dev/null
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Passord",
+"Submit" => "Send",
+"%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"
+);
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
new file mode 100644
index 0000000000000000000000000000000000000000..07bc26ecdd4f35c6f532758ee775511d1b635136
--- /dev/null
+++ b/apps/files_sharing/l10n/oc.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Senhal",
+"Submit" => "Sosmetre",
+"Download" => "Avalcarga",
+"web services under your control" => "Services web jos ton contraròtle"
+);
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index 4dde4bb5ad5b380daa58c4bd6b7bd267fe78f6ea..ce4c28ddcb5aa6620cff971dcc2e01dd7d52c2fc 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -5,5 +5,5 @@
 "%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" => "web services sob seu controle"
+"web services under your control" => "serviços web sob seu controle"
 );
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index b8e700e3802dfc0cc89f2defa750a05cdc249dfc..43e8f3c4b69f4b5ec8f10af372e97e7150f40da0 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Palavra-Passe",
+"Password" => "Password",
 "Submit" => "Submeter",
 "%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" => "Descarregar",
+"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"
 );
diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php
index 36e4b2fd0e1fceccc83a859368d0a7a9d6d189e2..2cadd163462aaa92e781eb415cde248d47a4d088 100644
--- a/apps/files_sharing/l10n/ru_RU.php
+++ b/apps/files_sharing/l10n/ru_RU.php
@@ -1,9 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Пароль",
-"Submit" => "Передать",
-"%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" => "веб-сервисы под Вашим контролем"
+"Download" => "Загрузка"
 );
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 1c69c608178673c4f6bd4ca5aae050b4df68f17d..580f7b1990a01502cfdfd38895bbfb75c7eded2a 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Password" => "මුරපදය",
+"Password" => "මුර පදය",
 "Submit" => "යොමු කරන්න",
 "%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
 "%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
-"Download" => "භාගත කරන්න",
+"Download" => "බාන්න",
 "No preview available for" => "පූර්වදර්ශනයක් නොමැත",
 "web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 );
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 2e781f76f385540606664e20a8a67876b1a2d37e..14124eeb8745f3c1d976dd881f22065c455c0d30 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -3,7 +3,7 @@
 "Submit" => "Odoslať",
 "%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" => "Stiahnuť",
+"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"
 );
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index 6e277f677119ce3b1f1373b57267142b73463d4c..be24c06e465c4e57f0f5876498dcf9ba61c353d2 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Лозинка",
 "Submit" => "Пошаљи",
-"Download" => "Преузми"
+"Download" => "Преузми",
+"web services under your control" => "веб сервиси под контролом"
 );
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
new file mode 100644
index 0000000000000000000000000000000000000000..cce6bd1f77154802b284a078142dbcdaf2d6864b
--- /dev/null
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Lozinka",
+"Submit" => "Pošalji",
+"Download" => "Preuzmi"
+);
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index f2e6e5697d629b473966dda9fb59438f7cea5f0d..42dfec8cc6f0a08d1a85dc73c1476e1715da2966 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Åžifre",
+"Password" => "Parola",
 "Submit" => "Gönder",
 "%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",
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..348acc4a898fda96c9ccde1479343933d95c37a6
--- /dev/null
+++ b/apps/files_sharing/l10n/ug.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Password" => "ئىم",
+"Submit" => "تاپشۇر",
+"Download" => "چۈشۈر"
+);
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index cdc103ad465be0e0c5dec0df6655bb5a5ca5ed9a..8e1fa4bc980892d9e7d6531b2611ad835934da62 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Пароль",
-"Submit" => "Submit",
+"Submit" => "Передати",
 "%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
 "%s shared the file %s with you" => "%s опублікував файл %s для Вас",
 "Download" => "Завантажити",
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index f1d28731a7fc78f11f3f48033e64cbd4423d63ba..14e4466ecb6183396ad5a6a895a7d501e2971c67 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Password" => "密碼",
 "Submit" => "送出",
-"%s shared the folder %s with you" => "%s 分享了資料夾 %s 給您",
-"%s shared the file %s with you" => "%s 分享了檔案 %s 給您",
+"%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" => "由您控制的網路服務"
 );
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 9fccd0b46f32481684e993d66b081cd4580b5cf0..2160fe9a393bb366a1e4fd0c6d3bf415684e2a1a 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -44,9 +44,9 @@ class Shared_Cache extends Cache {
 		$source = \OC_Share_Backend_File::getSource($target);
 		if (isset($source['path']) && isset($source['fileOwner'])) {
 			\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
-			$mount = \OC\Files\Mount::findByNumericId($source['storage']);
-			if ($mount) {
-				$fullPath = $mount->getMountPoint().$source['path'];
+			$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
+			if (is_array($mount)) {
+				$fullPath = $mount[key($mount)]->getMountPoint().$source['path'];
 				list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
 				if ($storage) {
 					$this->files[$target] = $internalPath;
@@ -60,6 +60,14 @@ class Shared_Cache extends Cache {
 		return false;
 	}
 
+	public function getNumericStorageId() {
+		if (isset($this->numericId)) {
+			return $this->numericId;
+		} else {
+			return false;
+		}
+	}
+
 	/**
 	 * get the stored metadata of a file or folder
 	 *
@@ -182,12 +190,10 @@ class Shared_Cache extends Cache {
 	 */
 	public function move($source, $target) {
 		if ($cache = $this->getSourceCache($source)) {
-			$targetPath = \OC_Share_Backend_File::getSourcePath(dirname($target));
-			if ($targetPath) {
-				$targetPath .= '/' . basename($target);
-				$cache->move($this->files[$source], $targetPath);
+			$file = \OC_Share_Backend_File::getSource($target);
+			if ($file && isset($file['path'])) {
+				$cache->move($this->files[$source], $file['path']);
 			}
-
 		}
 	}
 
@@ -269,4 +275,17 @@ class Shared_Cache extends Cache {
 		return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_GET_ALL);
 	}
 
-}
+	/**
+	 * find a folder in the cache which has not been fully scanned
+	 *
+	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+	 * use the one with the highest id gives the best result with the background scanner, since that is most
+	 * likely the folder where we stopped scanning previously
+	 *
+	 * @return string|bool the path of the folder or false when no folder matched
+	 */
+	public function getIncomplete() {
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index 6747faa4d4313269cbf1649774e625cbfd1f26f5..b6638564cd82c343070f6be07da1b3235d7f8747 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -70,6 +70,28 @@ class Shared_Permissions extends Permissions {
 		return $filePermissions;
 	}
 
+	/**
+	 * get the permissions for all files in a folder
+	 *
+	 * @param int $parentId
+	 * @param string $user
+	 * @return int[]
+	 */
+	public function getDirectoryPermissions($parentId, $user) {
+		// Root of the Shared folder
+		if ($parentId === -1) {
+			return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_PERMISSIONS);
+		}
+		$permissions = $this->get($parentId, $user);
+		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `parent` = ?');
+		$result = $query->execute(array($parentId));
+		$filePermissions = array();
+		while ($row = $result->fetchRow()) {
+			$filePermissions[$row['fileid']] = $permissions;
+		}
+		return $filePermissions;
+	}
+
 	/**
 	 * remove the permissions for a file
 	 *
@@ -83,4 +105,5 @@ class Shared_Permissions extends Permissions {
 	public function removeMultiple($fileIds, $user) {
 		// Not a valid action for Shared Permissions
 	}
-}
+
+}
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 62948651806fdde14b0d28b67d64dcaa57567cc5..07e7a4ca0c5ccaa1c26d6acb55141abbf351b47a 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -26,6 +26,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_FILE_APP_ROOT = 2;
 	const FORMAT_OPENDIR = 3;
 	const FORMAT_GET_ALL = 4;
+	const FORMAT_PERMISSIONS = 5;
 
 	private $path;
 
@@ -125,6 +126,12 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$ids[] = $item['file_source'];
 			}
 			return $ids;
+		} else if ($format === self::FORMAT_PERMISSIONS) {
+			$filePermissions = array();
+			foreach ($items as $item) {
+				$filePermissions[$item['file_source']] = $item['permissions'];
+			}
+			return $filePermissions;
 		}
 		return array();
 	}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index ffd4e5ced22bdd1264b2898b6b62bbe646f4be07..5c23a9eb0d0a69a0c1001786538c624790a718c6 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -71,9 +71,9 @@ class Shared extends \OC\Files\Storage\Common {
 		if ($source) {
 			if (!isset($source['fullPath'])) {
 				\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
-				$mount = \OC\Files\Mount::findByNumericId($source['storage']);
-				if ($mount) {
-					$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
+				$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
+				if (is_array($mount)) {
+					$this->files[$target]['fullPath'] = $mount[key($mount)]->getMountPoint().$source['path'];
 				} else {
 					$this->files[$target]['fullPath'] = false;
 				}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index c8aca498f8c573affb7c7d6389178dea2110cf5b..98d2a84fb6658183b5e1263ff73e8f6087e8285c 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,8 +1,14 @@
 <?php
-$RUNTIME_NOSETUPFS = true;
 // Load other apps for file previews
 OC_App::loadApps();
 
+if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+	header('HTTP/1.0 404 Not Found');
+	$tmpl = new OCP\Template('', '404', 'guest');
+	$tmpl->printPage();
+	exit();
+}
+
 function fileCmp($a, $b) {
 	if ($a['type'] == 'dir' and $b['type'] != 'dir') {
 		return -1;
@@ -39,6 +45,7 @@ if (isset($_GET['t'])) {
 			$fileOwner = $shareOwner;
 		}
 		if (isset($fileOwner)) {
+			OC_Util::tearDownFS();
 			OC_Util::setupFS($fileOwner);
 			$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
 		}
@@ -77,7 +84,7 @@ if (isset($path)) {
 					exit();
 				} else {
 					// Save item id in session for future requests
-					$_SESSION['public_link_authenticated'] = $linkItem['id'];
+					\OC::$session->set('public_link_authenticated', $linkItem['id']);
 				}
 			} else {
 				OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
@@ -90,8 +97,8 @@ if (isset($path)) {
 
 		} else {
 			// Check if item id is set in session
-			if (!isset($_SESSION['public_link_authenticated'])
-				|| $_SESSION['public_link_authenticated'] !== $linkItem['id']
+			if ( ! \OC::$session->exists('public_link_authenticated')
+				|| \OC::$session->get('public_link_authenticated') !== $linkItem['id']
 			) {
 				// Prompt for password
 				$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index e83d3b8fbbd766ccadf600b766452bec191e3a16..3b1e0ac30cc3e4dc802cc86e427e3f7c64d4e475 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -3,7 +3,5 @@
 OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
 OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
 
-//Listen to delete file signal
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
-//Listen to delete user signal
-OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
\ No newline at end of file
+// register hooks
+\OCA\Files_Trashbin\Trashbin::registerHooks();
\ No newline at end of file
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 7f807da579ea0a8013c251123650fc5636e29505..e9cbdafc1cdc2738dced01293e85313e21dc2c1c 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -2,7 +2,20 @@
 <info>
 	<id>files_trashbin</id>
 	<name>Deleted files</name>
-	<description>Keep a copy of deleted files so that they can be restored if needed</description>
+	<description>
+	ownCloud keeps a copy of your deleted files in case you need them again. 
+	To make sure that the user doesn't run out of memory the deleted files app
+	manages the size of the deleted files for the user. By default deleted files
+	stay in the trash bin for 180 days. ownCloud checks the age of the files
+	every time a new files gets moved to the deleted files and remove all files
+	older than 180 days. The user can adjust this value in the config.php by
+	setting the "trashbin_retention_obligation" value.
+
+	Beside that the delted files app take care to never use more that 50% of
+	your currently available free space. If your deleted files exceed this limit
+	ownCloud deletes the oldest versions until it meets the memory usage limit
+	again.
+	</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
 	<shipped>true</shipped>
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 8a5875b9ce605214fcf65c2d34c27d52dcf5d779..a32b7414ac6a1b5a9a14c56d9753853ce38fb270 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -21,8 +21,7 @@ $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 $result = array();
 if ($dir) {
 	$dirlisting = true;
-	$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
-	$dirContent = opendir($fullpath);
+	$dirContent = $view->opendir($dir);
 	$i = 0;
 	while($entryName = readdir($dirContent)) {
 		if ( $entryName != '.' && $entryName != '..' ) {
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index eed253d66025ecea4341ec018506505f5485ead3..691642811b74f35ba46912065e6839e71becc4d0 100644
Binary files a/apps/files_trashbin/js/trash.js and b/apps/files_trashbin/js/trash.js differ
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 31c5dcb4ef19470bb49004af6e990cac3ccb0e69..288518e1a41320914d5abee9cae4a70af6460318 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -13,5 +13,6 @@
 "{count} files" => "{count} файла",
 "Nothing in here. Your trash bin is empty!" => "Няма нищо. Кофата е празна!",
 "Restore" => "Възтановяване",
-"Delete" => "Изтриване"
+"Delete" => "Изтриване",
+"Deleted Files" => "Изтрити файлове"
 );
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..055e8d8654dd68ae2f0a22c0a17d6e61d5ce9b76
--- /dev/null
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
+"Couldn't restore %s" => "Methwyd adfer %s",
+"perform restore operation" => "gweithrediad adfer",
+"Error" => "Gwall",
+"delete file permanently" => "dileu ffeil yn barhaol",
+"Delete permanently" => "Dileu'n barhaol",
+"Name" => "Enw",
+"Deleted" => "Wedi dileu",
+"1 folder" => "1 blygell",
+"{count} folders" => "{count} plygell",
+"1 file" => "1 ffeil",
+"{count} files" => "{count} ffeil",
+"Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
+"Restore" => "Adfer",
+"Delete" => "Dileu",
+"Deleted Files" => "Ffeiliau Ddilewyd"
+);
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
index 0a51752312f37a994aeda4b736d693241143e46a..dea25b30ba45adc3b79a7625bed071f62e29890f 100644
--- a/apps/files_trashbin/l10n/ia.php
+++ b/apps/files_trashbin/l10n/ia.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Error",
 "Name" => "Nomine",
 "Delete" => "Deler"
 );
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index e06c66784f24d3820d532363813db331986d9da2..62a63d515a3749ac279aa642c8132f22d0a1da05 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -2,13 +2,13 @@
 "Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
 "Couldn't restore %s" => "Tidak dapat memulihkan %s",
 "perform restore operation" => "jalankan operasi pemulihan",
-"Error" => "kesalahan",
+"Error" => "Galat",
 "delete file permanently" => "hapus berkas secara permanen",
-"Delete permanently" => "hapus secara permanen",
+"Delete permanently" => "Hapus secara permanen",
 "Name" => "Nama",
 "Deleted" => "Dihapus",
-"1 folder" => "1 map",
-"{count} folders" => "{count} map",
+"1 folder" => "1 folder",
+"{count} folders" => "{count} folder",
 "1 file" => "1 berkas",
 "{count} files" => "{count} berkas",
 "Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index f06c90962eaed68b56d0b60f642679822e443673..42ad87e98d2247283f347a1df1e85f5de1e4f83e 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "오류",
+"Delete permanently" => "영원히 삭제",
 "Name" => "이름",
 "1 folder" => "폴더 1개",
 "{count} folders" => "폴더 {count}개",
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index e1dce4b399525bf2fb3672a8595958393b7d65b7..43ad018049447a8d0a1b6c1bcf98a031bf498680 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -13,5 +13,6 @@
 "{count} files" => "{count} filer",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
 "Restore" => "Gjenopprett",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Deleted Files" => "Slettet filer"
 );
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 14345ddcc4d49bedbb37d3f547197fd7b8e048ed..454ea2b05753198172040752659ff7bc99149290 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -1,5 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
+"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
+"perform restore operation" => "utfør gjenoppretting",
 "Error" => "Feil",
+"delete file permanently" => "slett fila for godt",
+"Delete permanently" => "Slett for godt",
 "Name" => "Namn",
-"Delete" => "Slett"
+"Deleted" => "Sletta",
+"1 folder" => "1 mappe",
+"{count} folders" => "{count} mapper",
+"1 file" => "1 fil",
+"{count} files" => "{count} filer",
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
+"Restore" => "Gjenopprett",
+"Delete" => "Slett",
+"Deleted Files" => "Sletta filer"
 );
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 7fd1ab21ecd61a9aef32bac14a90e076d52f5a64..5c9f558f11fd610ed79046a6cd880493f05e0a6d 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -8,9 +8,9 @@
 "Name" => "Nazwa",
 "Deleted" => "Usunięte",
 "1 folder" => "1 folder",
-"{count} folders" => "{count} foldery",
+"{count} folders" => "Ilość folderów: {count}",
 "1 file" => "1 plik",
-"{count} files" => "{count} pliki",
+"{count} files" => "Ilość plików: {count}",
 "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
 "Restore" => "Przywróć",
 "Delete" => "Usuń",
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 84a07fb0d0b548a975a126787a783c75bc9e53d1..ba85158b70e1a4c3a098232f3e5595b5454409e5 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
-"perform restore operation" => "Restaurar",
+"perform restore operation" => "executar a operação de restauro",
 "Error" => "Erro",
 "delete file permanently" => "Eliminar permanentemente o(s) ficheiro(s)",
 "Delete permanently" => "Eliminar permanentemente",
@@ -11,8 +11,8 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
-"Nothing in here. Your trash bin is empty!" => "Não ha ficheiros. O lixo está vazio",
+"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
 "Restore" => "Restaurar",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
 "Deleted Files" => "Ficheiros Apagados"
 );
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index c03ef600f35ec122d787838f6c6491722b86381f..3af21b7e3f367ab670c38fa81358d1db4835668e 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "Eroare",
+"Delete permanently" => "Stergere permanenta",
 "Name" => "Nume",
 "1 folder" => "1 folder",
 "{count} folders" => "{count} foldare",
diff --git a/apps/files_trashbin/l10n/ru_RU.php b/apps/files_trashbin/l10n/ru_RU.php
index 178eb531077ceb3e661ff107f9480da8b9fdb31d..8636e417ecb207808d94e78c9acc8e05d51d1266 100644
--- a/apps/files_trashbin/l10n/ru_RU.php
+++ b/apps/files_trashbin/l10n/ru_RU.php
@@ -1,18 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
-"Couldn't restore %s" => "%s не может быть восстановлен",
-"perform restore operation" => "выполнить операцию восстановления",
 "Error" => "Ошибка",
-"delete file permanently" => "удалить файл навсегда",
-"Delete permanently" => "Удалить навсегда",
 "Name" => "Имя",
-"Deleted" => "Удалён",
-"1 folder" => "1 папка",
-"{count} folders" => "{количество} папок",
-"1 file" => "1 файл",
-"{count} files" => "{количество} файлов",
-"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Restore" => "Восстановить",
-"Delete" => "Удалить",
-"Deleted Files" => "Удаленные файлы"
+"Delete" => "Удалить"
 );
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index 7203f4c75fcda5d8ec19f6af27c6d79955e4c1d5..7cef36ef1c0805436aed68f7816bc32542f19f33 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -5,7 +5,7 @@
 "Error" => "Chyba",
 "delete file permanently" => "trvalo zmazať súbor",
 "Delete permanently" => "Zmazať  trvalo",
-"Name" => "Meno",
+"Name" => "Názov",
 "Deleted" => "Zmazané",
 "1 folder" => "1 priečinok",
 "{count} folders" => "{count} priečinkov",
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index 81a65b819f6bc85481b499ab694d2a363c37ab30..280c2b028204dcca9d3be74749416cdef968d070 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "perform restore operation" => "врати у претходно стање",
 "Error" => "Грешка",
+"Delete permanently" => "Обриши за стално",
 "Name" => "Име",
 "Deleted" => "Обрисано",
 "1 folder" => "1 фасцикла",
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..c369e385f740c1950fd7a105c8901054eecb10fd
--- /dev/null
+++ b/apps/files_trashbin/l10n/ug.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Error" => "خاتالىق",
+"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
+"Name" => "ئاتى",
+"Deleted" => "ئۆچۈرۈلدى",
+"1 folder" => "1 قىسقۇچ",
+"1 file" => "1 ھۆججەت",
+"{count} files" => "{count} ھۆججەت",
+"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
+"Delete" => "ئۆچۈر"
+);
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index adfde6c06e5815d003dbe0d69ae2be8398e5a7c0..a9dcba8f7d73ea151c6cd6aff67bfdf2a0723a96 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "無法永久刪除%s",
-"Couldn't restore %s" => "無法復原%s",
+"Couldn't delete %s permanently" => "無法永久刪除 %s",
+"Couldn't restore %s" => "無法復原 %s",
 "perform restore operation" => "進行復原動作",
 "Error" => "錯誤",
-"delete file permanently" => "永久刪除文件",
+"delete file permanently" => "永久刪除檔案",
 "Delete permanently" => "永久刪除",
 "Name" => "名稱",
 "Deleted" => "已刪除",
@@ -11,7 +11,7 @@
 "{count} folders" => "{count} 個資料夾",
 "1 file" => "1 個檔案",
 "{count} files" => "{count} 個檔案",
-"Nothing in here. Your trash bin is empty!" => "這裏沒東西。您的垃圾桶是空的！",
+"Nothing in here. Your trash bin is empty!" => "您的垃圾桶是空的！",
 "Restore" => "復原",
 "Delete" => "刪除",
 "Deleted Files" => "已刪除的檔案"
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 9efb041bb9d037710f1ab47a4babde4b699e0344..2d1830a38f1b4a8e10e575dab4cfc2b5222fdb49 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -29,6 +29,17 @@ class Trashbin {
 	// unit: percentage; 50% of available disk space/quota
 	const DEFAULTMAXSIZE=50;
 
+	public static function getUidAndFilename($filename) {
+		$uid = \OC\Files\Filesystem::getOwner($filename);
+		\OC\Files\Filesystem::initMountPoints($uid);
+		if ( $uid != \OCP\User::getUser() ) {
+			$info = \OC\Files\Filesystem::getFileInfo($filename);
+			$ownerView = new \OC\Files\View('/'.$uid.'/files');
+			$filename = $ownerView->getPath($info['fileid']);
+		}
+		return array($uid, $filename);
+	}
+
 	/**
 	 * move file to the trash bin
 	 *
@@ -39,14 +50,15 @@ class Trashbin {
 		$view = new \OC\Files\View('/'. $user);
 		if (!$view->is_dir('files_trashbin')) {
 			$view->mkdir('files_trashbin');
-			$view->mkdir("files_trashbin/files");
-			$view->mkdir("files_trashbin/versions");
-			$view->mkdir("files_trashbin/keyfiles");
+			$view->mkdir('files_trashbin/files');
+			$view->mkdir('files_trashbin/versions');
+			$view->mkdir('files_trashbin/keyfiles');
+            $view->mkdir('files_trashbin/share-keys');
 		}
 
 		$path_parts = pathinfo($file_path);
 
-		$deleted = $path_parts['basename'];
+		$filename = $path_parts['basename'];
 		$location = $path_parts['dirname'];
 		$timestamp = time();
 		$mime = $view->getMimeType('files'.$file_path);
@@ -61,84 +73,174 @@ class Trashbin {
 		if ( $trashbinSize === false || $trashbinSize < 0 ) {
 			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
 		}
-		
-		$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view);
-		
-		if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) {
+
+		// 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);
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		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($deleted, $timestamp, $location, $type, $mime, $user));
+			$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/'.$deleted.'.d'.$timestamp);
+				$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($deleted.'.d'.$timestamp)));
-			
-			// Take care of file versions
-			if ( \OCP\App::isEnabled('files_versions') ) {
-				if ( $view->is_dir('files_versions/'.$file_path) ) {
-					$trashbinSize += self::calculateSize(new \OC\Files\View('/'. $user.'/files_versions/'.$file_path));
-					$view->rename('files_versions/'.$file_path, 'files_trashbin/versions'. $deleted.'.d'.$timestamp);
-				} else if ( $versions = \OCA\Files_Versions\Storage::getVersions($user, $file_path) ) {
-					foreach ($versions as $v) {
-						$trashbinSize += $view->filesize('files_versions'.$v['path'].'.v'.$v['version']);
-						$view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'files_trashbin/versions/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
-					}
-				}
-			}
-			
-			// Take care of encryption keys
-			$keyfile = \OC\Files\Filesystem::normalizePath('files_encryption/keyfiles/'.$file_path);
-			if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile.'.key') ) {
-				if ( $view->is_dir('files'.$file_path) ) {
-					$trashbinSize += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
-					$view->rename($keyfile, 'files_trashbin/keyfiles/'. $deleted.'.d'.$timestamp);
-				} else {
-					$trashbinSize += $view->filesize($keyfile.'.key');
-					$view->rename($keyfile.'.key', 'files_trashbin/keyfiles/'. $deleted.'.key.d'.$timestamp);
-				}
-			}
+							'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);
 		}
-		
-		// get available disk space for user
-		$quota = \OC_Preferences::getValue($user, 'files', 'quota');
-		if ( $quota === null || $quota === 'default') {
-			$quota = \OC_Appconfig::getValue('files', 'default_quota');
-		}
-		if ( $quota === null || $quota === 'none' ) {
-			$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
-		} else {
-			$quota = \OCP\Util::computerFileSize($quota);
-		}
-		
-		// calculate available space for trash bin
-		$rootInfo = $view->getFileInfo('/files');
-		$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;
-		}
-		$trashbinSize -= self::expire($availableSpace);
+
+		$trashbinSize -= self::expire($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
+     */
+	private static function retainVersions($view, $file_path, $filename, $timestamp) {
+		$size = 0;
+        if (\OCP\App::isEnabled('files_versions')) {
+
+            // disable proxy to prevent recursive calls
+            $proxyStatus = \OC_FileProxy::$enabled;
+            \OC_FileProxy::$enabled = false;
+
+            $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);
+			} 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);
+				}
+			}
+
+            // 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
+     */
+	private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
+		$size = 0;
+
+		if (\OCP\App::isEnabled('files_encryption')) {
+
+			$user = \OCP\User::getUser();
+			$rootView = new \OC\Files\View('/');
+
+			list($owner, $ownerPath) = self::getUidAndFilename($file_path);
+
+
+            // 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);
+
+            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);
+				}
+			}
+
+            // 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);
+			} else {
+                // get local path to share-keys
+                $localShareKeysPath = $rootView->getLocalFile($sharekeys);
+
+                // handle share-keys
+                $matches = glob(preg_quote($localShareKeysPath).'*.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';
+
+                    // 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');
+
+                        // 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);
+                    }
+                }
+
+            }
+
+            // enable proxy
+            \OC_FileProxy::$enabled = $proxyStatus;
+		}
+		return $size;
+	}
 
 	/**
 	 * restore files from trash bin
 	 * @param $file path to the deleted file
 	 * @param $filename name of the file
 	 * @param $timestamp time when the file was deleted
-	 */
+     *
+     * @return bool
+     */
 	public static function restore($file, $filename, $timestamp) {
-		$user = \OCP\User::getUser();
+
+        $user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/'.$user);
 		
 		$trashbinSize = self::getTrashbinSize($user);
@@ -176,8 +278,20 @@ class Trashbin {
 		// 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);
-		if( $view->rename($source, $target.$ext) ) {
-			$view->touch($target.$ext, $mtime);
+
+        // disable proxy to prevent recursive calls
+        $proxyStatus = \OC_FileProxy::$enabled;
+        \OC_FileProxy::$enabled = false;
+
+        // restore file
+        $restoreResult = $view->rename($source, $target.$ext);
+
+        // handle the restore result
+        if( $restoreResult ) {
+			$fakeRoot = $view->getRoot();
+			$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)));
@@ -186,68 +300,195 @@ class Trashbin {
 			} else {
 				$trashbinSize -= $view->filesize($target.$ext);
 			}
-			// if versioning app is enabled, copy versions from the trash bin back to the original location
-			if ( \OCP\App::isEnabled('files_versions') ) {
-				if ($timestamp ) {
-					$versionedFile = $filename;
-				} else {
-					$versionedFile = $file;
-				}
-				if ( $result[0]['type'] === 'dir' ) {
-					$trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.'files_trashbin/versions/'. $file));
-					$view->rename(\OC\Files\Filesystem::normalizePath('files_trashbin/versions/'. $file), \OC\Files\Filesystem::normalizePath('files_versions/'.$location.'/'.$filename.$ext));
-				} else if ( $versions = self::getVersionsFromTrash($versionedFile, $timestamp) ) {
-					foreach ($versions as $v) {
-						if ($timestamp ) {
-							$trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp);
-							$view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
-						} else {
-							$trashbinSize -= $view->filesize('files_trashbin/versions/'.$versionedFile.'.v'.$v);
-							$view->rename('files_trashbin/versions/'.$versionedFile.'.v'.$v, 'files_versions/'.$location.'/'.$filename.$ext.'.v'.$v);
-						}
-					}
-				}
-			}
-			
-			// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
-			$parts = pathinfo($file);
-			if ( $result[0]['type'] === 'dir' ) {
-				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename);
-			} else {
-				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$parts['dirname'].'/'.$filename.'.key');
-			}
-			if ($timestamp) {
-				$keyfile .= '.d'.$timestamp;
-			}
-			if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
-				if ( $result[0]['type'] === 'dir' ) {
-					$trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
-					$view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename);
-				} else {
-					$trashbinSize -= $view->filesize($keyfile);
-					$view->rename($keyfile, 'files_encryption/keyfiles/'. $location.'/'.$filename.'.key');
-				}
-			}
-			
+
+            $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
+			$trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
+
 			if ( $timestamp ) {
 				$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
 				$query->execute(array($user,$filename,$timestamp));
 			}
 
 			self::setTrashbinSize($user, $trashbinSize);
-			
+
+            // enable proxy
+            \OC_FileProxy::$enabled = $proxyStatus;
+
 			return true;
-		} else {
-			\OC_Log::write('files_trashbin', 'Couldn\'t restore file from trash bin, '.$filename, \OC_log::ERROR);
 		}
 
+        // enable proxy
+        \OC_FileProxy::$enabled = $proxyStatus;
+
 		return false;
 	}
 
+    /**
+	 * @brief restore versions from trash bin
+	 *
+	 * @param \OC\Files\View $view file 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 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;
+
+            $user = \OCP\User::getUser();
+			$rootView = new \OC\Files\View('/');
+
+			$target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+
+			list($owner, $ownerPath) = self::getUidAndFilename($target);
+
+			if ($timestamp) {
+				$versionedFile = $filename;
+			} else {
+				$versionedFile = $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));
+			} 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);
+					} 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);
+					}
+				}
+			}
+
+            // 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) {
+		// 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);
+
+			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);
+
+				} else {
+                    // handle keyfiles
+					$size += $rootView->filesize($keyfile);
+            		$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;
+                    }
+
+                    $size += $rootView->filesize($ownerShareKey);
+
+                    // 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);
+
+                    // fix the file size
+                    $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/'. $ownerPath);
+                    $util->fixFileSize($absolutePath);
+
+                    // get current sharing state
+                    $sharingEnabled = \OCP\Share::isEnabled();
+
+                    // get the final filename
+                    $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename);
+
+                    // get users sharing this file
+                    $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user);
+
+                    // Attempt to set shareKey
+                    $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext);
+				}
+			}
+
+            // enable proxy
+            \OC_FileProxy::$enabled = $proxyStatus;
+		}
+		return $size;
+	}
+
 	/**
-	 * delete file from trash bin permanently
+	 * @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) {
@@ -268,7 +509,25 @@ class Trashbin {
 			$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));
+		} else {
+			$size += $view->filesize('/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') ) {
+			$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);
@@ -284,35 +543,37 @@ class Trashbin {
 				}
 			}
 		}
-		
-		// Take care of encryption keys
-		$parts = pathinfo($file);
-		if ( $view->is_dir('/files_trashbin/files/'.$file) ) {
-			$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename);
-		} else {
-			$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/'.$filename.'.key');
-		}
-		if ($timestamp) {
-			$keyfile .= '.d'.$timestamp;
-		}
-		if ( \OCP\App::isEnabled('files_encryption') && $view->file_exists($keyfile) ) {
-			if ( $view->is_dir($keyfile) ) {
-				$size += self::calculateSize(new \OC\Files\View('/'.$user.'/'.$keyfile));
+		return $size;
+	}
+
+	private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) {
+		$size = 0;
+		if (\OCP\App::isEnabled('files_encryption')) {
+			$user = \OCP\User::getUser();
+
+			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);
 			} else {
-				$size += $view->filesize($keyfile);
+				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
+				$sharekeys =  \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
+			}
+			if ($timestamp) {
+				$keyfile .= '.d' . $timestamp;
+				$sharekeys .= '.d' . $timestamp;
+			}
+			if ($view->file_exists($keyfile)) {
+				if ($view->is_dir($keyfile)) {
+					$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
+					$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
+				} else {
+					$size += $view->filesize($keyfile);
+					$size += $view->filesize($sharekeys);
+				}
+				$view->unlink($keyfile);
+				$view->unlink($sharekeys);
 			}
-			$view->unlink($keyfile);
-		}
-	
-		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);
 		}
-		$view->unlink('/files_trashbin/files/'.$file);
-		$trashbinSize -= $size;
-		self::setTrashbinSize($user, $trashbinSize);
-		
 		return $size;
 	}
 
@@ -352,14 +613,53 @@ class Trashbin {
 		return false;
 	}
 
+	/**
+	 * calculate remaining free space for trash bin
+	 *
+	 * @param $trashbinSize current size of the trash bin
+	 * @return available free space for trash bin
+	 */
+	private static function calculateFreeSpace($trashbinSize) {
+		$softQuota = true;
+		$user = \OCP\User::getUser();
+		$quota = \OC_Preferences::getValue($user, 'files', 'quota');
+		$view = new \OC\Files\View('/'.$user);
+		if ( $quota === null || $quota === 'default') {
+			$quota = \OC_Appconfig::getValue('files', 'default_quota');
+		}
+		if ( $quota === null || $quota === 'none' ) {
+			$quota = \OC\Files\Filesystem::free_space('/');
+			$softQuota = false;
+		} else {
+			$quota = \OCP\Util::computerFileSize($quota);
+		}
+
+		// calculate available space for trash bin
+		// 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 ) {
+				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
+			} else {
+				$availableSpace = $free-$trashbinSize;
+			}
+		} else {
+			$availableSpace = $quota;
+		}
+
+		return $availableSpace;
+	}
+
 	/**
 	 * clean up the trash bin
-	 * @param max. available disk space for trashbin
+	 * @param current size of the trash bin
 	 */
-	private static function expire($availableSpace) {
+	private static function expire($trashbinSize) {
 
 		$user = \OCP\User::getUser();
 		$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`=?');
@@ -375,6 +675,7 @@ class Trashbin {
 			$filename = $r['id'];
 			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);
 			}
 		}
 		$availableSpace = $availableSpace + $size;
@@ -387,6 +688,7 @@ class Trashbin {
 			$i = 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);
 				$availableSpace += $tmp;
 				$size += $tmp;
 				$i++;
@@ -531,5 +833,14 @@ class Trashbin {
 		}
 		$query->execute(array($size, $user));
 	}
-	
+
+	/**
+	 * register hooks
+	 */
+	public static function registerHooks() {
+		//Listen to delete file signal
+		\OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");
+		//Listen to delete user signal
+		\OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
+	}
 }
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 44878da5e4d8ccabc2d4bd9a45a5ec5616fc54da..661d64aa979fba9f25fea6c6f24a340f1c67eb64 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -6,7 +6,25 @@
 	<author>Frank Karlitschek</author>
 	<require>4.93</require>
 	<shipped>true</shipped>
-	<description>Versioning of files</description>
+	<description>
+	ownCloud supports simple version control for files.	The versioning app
+	expires old versions automatically to make sure that
+	the user doesn't run out of space. Following pattern is used to delete
+	old versions:
+	For the first 10 seconds ownCloud keeps one version every 2 seconds;
+	For the first hour ownCloud keeps one version every minute;
+	For the first 24 hours ownCloud keeps one version every hour;
+	For the first 30 days ownCloud keeps one version every day;
+	After the first 30 days ownCloud keeps one version every week.
+
+	The versions are adjusted along this pattern every time a new version gets
+	created.
+
+	Beside that the version app takes care to never use more that 50% of the users
+	currently available free space. If the stored versions exceed this limit
+	ownCloud deletes the oldest versions until it meets the memory usage limit
+	again.
+	</description>
 	<types>
 		<filesystem/>
 	</types>
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index 6a1882c2bfddb954b77451753f671f4cabc45ef9..a03d9adcf079e30dbe53c46d398b9d98034153a2 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
+"success" => "успешно",
+"File %s was reverted to version %s" => "Файлът %s бе върнат към версия %s",
 "Versions" => "Версии"
 );
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index 930cfbc33a7e3cb335cfd3d7d0de66f0b98d15e0..c8d2f7cfacdc289bce2ef79d46c63841de943149 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -7,5 +7,5 @@
 "No old versions available" => "Vanu versioone pole saadaval",
 "No path specified" => "Asukohta pole määratud",
 "Versions" => "Versioonid",
-"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides \"Revert\" nupule"
+"Revert a file to a previous version by clicking on its revert button" => "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
 );
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 9eb4df64857fbd7675bc0814d65a286c39b96871..ad2e261d5391028d34b81bc2c2beca95e83e0f74 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "היסטוריה",
-"Files Versioning" => "שמירת הבדלי גרסאות של קבצים",
-"Enable" => "הפעלה"
+"Versions" => "גרסאות"
 );
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index db5dbad49fcae65da0279cb0693592900767bca7..9132caf75e3123387298d67c5a24794245dd23bb 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "مێژوو",
-"Files Versioning" => "وه‌شانی په‌ڕگه",
-"Enable" => "چالاککردن"
+"Versions" => "وه‌شان"
 );
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index 18c725061027a0a0d216ca3850a5aaf50e71c1ff..df59dfe4c8c094872bd470a2d08de9c326dc9430 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "Historie",
-"Files Versioning" => "Fil versjonering",
-"Enable" => "Aktiver"
+"Versions" => "Versjoner"
 );
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..940cc2371a107918df31404f5cd3d4504eaa9e71
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "Klarte ikkje å tilbakestilla: %s",
+"success" => "vellukka",
+"File %s was reverted to version %s" => "Tilbakestilte fila %s til utgåva %s",
+"failure" => "feil",
+"File %s could not be reverted to version %s" => "Klarte ikkje tilbakestilla fila %s til utgåva %s",
+"No old versions available" => "Ingen eldre utgåver tilgjengelege",
+"No path specified" => "Ingen sti gjeve",
+"Versions" => "Utgåver",
+"Revert a file to a previous version by clicking on its revert button" => "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
+);
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index 7dfaee3672b1c391f0968599560062f54ccc4cb0..cd9fc89dcc6bb545bdbec800d9713c25ef65f5d5 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,5 +1,11 @@
 <?php $TRANSLATIONS = array(
-"History" => "Istoric",
-"Files Versioning" => "Versionare fișiere",
-"Enable" => "Activare"
+"Could not revert: %s" => "Nu a putut reveni: %s",
+"success" => "success",
+"File %s was reverted to version %s" => "Fisierul %s a revenit la versiunea %s",
+"failure" => "eșec",
+"File %s could not be reverted to version %s" => "Fisierele %s nu au putut reveni la versiunea %s",
+"No old versions available" => "Versiunile vechi nu sunt disponibile",
+"No path specified" => "Nici un dosar specificat",
+"Versions" => "Versiuni",
+"Revert a file to a previous version by clicking on its revert button" => "Readuceti un fișier la o versiune anterioară, făcând clic pe butonul revenire"
 );
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index 37debf869bc55f054c322f5993256f8f8e9c7ebf..c7ee63d8ef637ca2775906527634bb3f94ee3509 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "ඉතිහාසය",
-"Files Versioning" => "ගොනු අනුවාදයන්",
-"Enable" => "සක්‍රිය කරන්න"
+"Versions" => "අනුවාද"
 );
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index aca76dcc2621697e3f515abcbbc9229da15a6511..61a47e42f0a13eac7636bf9408137adacaad908c 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "வரலாறு",
-"Files Versioning" => "கோப்பு பதிப்புகள்",
-"Enable" => "இயலுமைப்படுத்துக"
+"Versions" => "பதிப்புகள்"
 );
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index e1e996903aea02efcef879b9c7c8525ae842928c..2998f74838991e12191754b17f30c93c4bac2d4d 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"History" => "ประวัติ",
-"Files Versioning" => "การกำหนดเวอร์ชั่นของไฟล์",
-"Enable" => "เปิดใช้งาน"
+"Versions" => "รุ่น"
 );
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..024f326b032a9574b864cdda14d9a70df2298aaf
--- /dev/null
+++ b/apps/files_versions/l10n/ug.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Could not revert: %s" => "ئەسلىگە قايتۇرالمايدۇ: %s",
+"success" => "مۇۋەپپەقىيەتلىك",
+"File %s was reverted to version %s" => "ھۆججەت %s نى %s نەشرىگە ئەسلىگە قايتۇردى",
+"failure" => "مەغلۇپ بولدى",
+"No old versions available" => "كونا نەشرى يوق",
+"No path specified" => "يول بەلگىلەنمىگەن",
+"Versions" => "نەشرى"
+);
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index f2499e7bf355fe4dae3b0bff6fb4caabc67e0ed5..33b045f2e3e859a6e99d3a73ed29bcef23d3e8d9 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "File %s không thể khôi phục về phiên bản %s",
 "No old versions available" => "Không có phiên bản cũ nào",
 "No path specified" => "Không chỉ ra đường dẫn rõ ràng",
+"Versions" => "Phiên bản",
 "Revert a file to a previous version by clicking on its revert button" => "Khôi phục một file về phiên bản trước đó bằng cách click vào nút Khôi phục tương ứng"
 );
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index a191d5945237d18d9cbb54852a0ff7b9eb8a2640..2ae9ce657ceec2d379c69eaab4ef5933900367c6 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -5,7 +5,7 @@
 "failure" => "失敗",
 "File %s could not be reverted to version %s" => "檔案 %s 無法復原至版本 %s",
 "No old versions available" => "沒有舊的版本",
-"No path specified" => "沒有指定路線",
+"No path specified" => "沒有指定路徑",
 "Versions" => "版本",
-"Revert a file to a previous version by clicking on its revert button" => "按一按復原的按鈕，就能把一個檔案復原至以前的版本"
+"Revert a file to a previous version by clicking on its revert button" => "按一下復原的按鈕即可把檔案復原至以前的版本"
 );
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 47d044873ad731399af81dcc1279ba558c7253ce..4beb9e0fe5cc18929f4255871836c3de4d009ab8 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -113,8 +113,16 @@ class Storage {
 				mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
 			}
 
+			// disable proxy to prevent multiple fopen calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
 			// store a new version of a file
 			$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+
+			// reset proxy state
+			\OC_FileProxy::$enabled = $proxyStatus;
+
 			$versionsSize = self::getVersionsSize($uid);
 			if (  $versionsSize === false || $versionsSize < 0 ) {
 				$versionsSize = self::calculateSize($uid);
@@ -184,24 +192,34 @@ class Storage {
 	/**
 	 * rollback to an old version of a file.
 	 */
-	public static function rollback($filename, $revision) {
+	public static function rollback($file, $revision) {
 
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			list($uid, $filename) = self::getUidAndFilename($filename);
+			list($uid, $filename) = self::getUidAndFilename($file);
 			$users_view = new \OC\Files\View('/'.$uid);
+			$files_view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
 			$versionCreated = false;
 
 			//first create a new version
 			$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
 			if ( !$users_view->file_exists($version)) {
+
+				// disable proxy to prevent multiple fopen calls
+				$proxyStatus = \OC_FileProxy::$enabled;
+				\OC_FileProxy::$enabled = false;
+
 				$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+
+				// reset proxy state
+				\OC_FileProxy::$enabled = $proxyStatus;
+
 				$versionCreated = true;
 			}
 
 			// rollback
-			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
-				$users_view->touch('files'.$filename, $revision);
-				Storage::expire($filename);
+			if( @$users_view->rename('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
+				$files_view->touch($file, $revision);
+				Storage::expire($file);
 				return true;
 
 			}else if ( $versionCreated ) {
@@ -378,12 +396,14 @@ class Storage {
 			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
 
 			// get available disk space for user
+			$softQuota = true;
 			$quota = \OC_Preferences::getValue($uid, 'files', 'quota');
 			if ( $quota === null || $quota === 'default') {
 				$quota = \OC_Appconfig::getValue('files', 'default_quota');
 			}
 			if ( $quota === null || $quota === 'none' ) {
-				$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
+				$quota = \OC\Files\Filesystem::free_space('/');
+				$softQuota = false;
 			} else {
 				$quota = \OCP\Util::computerFileSize($quota);
 			}
@@ -397,15 +417,21 @@ class Storage {
 			}
 
 			// calculate available space for version history
-			$files_view = new \OC\Files\View('/'.$uid.'/files');
-			$rootInfo = $files_view->getFileInfo('/');
-			$free = $quota-$rootInfo['size']; // remaining free space for user
-			if ( $free > 0 ) {
-				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+			// subtract size of files and current versions size from quota
+			if ($softQuota) {
+				$files_view = new \OC\Files\View('/'.$uid.'/files');
+				$rootInfo = $files_view->getFileInfo('/');
+				$free = $quota-$rootInfo['size']; // remaining free space for user
+				if ( $free > 0 ) {
+					$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+				} else {
+					$availableSpace = $free-$versionsSize;
+				}
 			} else {
-				$availableSpace = $free-$versionsSize;
+				$availableSpace = $quota;
 			}
 
+
 			// after every 1000s run reduce the number of all versions not only for the current file
 			$random = rand(0, 1000);
 			if ($random == 0) {
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index f7284439041e7762f50723fc87bbf5a7d77ae12b..3a6d5f0c9e7baaae22bf7d94be22553ff10546fe 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -5,18 +5,18 @@
 if( isset( $_['message'] ) ) {
 
 
-	if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path'])).'</strong><br>';
-	print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) ).'</strong><br>';
+	if( isset($_['path'] ) ) print_unescaped('<strong>File: '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
+	print_unescaped('<strong>'.OC_Util::sanitizeHTML($_['message']) .'</strong><br>');
 
 }else{
 
 	if( isset( $_['outcome_stat'] ) ) {
 
-		print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']) ).'</h3></div><br>';
+		print_unescaped( '<div id="feedback-messages" class="'.OC_Util::sanitizeHTML($_['outcome_stat']).'"><h3>'.OC_Util::sanitizeHTML($_['outcome_msg']).'</h3></div><br>');
 
 	}
 
-	print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']) ).'</strong><br>';
+	print_unescaped( '<strong>Versions of '.OC_Util::sanitizeHTML($_['path']).'</strong><br>');
 	print_unescaped('<p><em>'.OC_Util::sanitizeHTML($l->t('Revert a file to a previous version by clicking on its revert button')).'</em></p><br />');
 
 	foreach ( $_['versions'] as $v ) {
diff --git a/apps/user_ldap/ajax/clearMappings.php b/apps/user_ldap/ajax/clearMappings.php
new file mode 100644
index 0000000000000000000000000000000000000000..5dab39839b63327b1219dc18b0d97391c13698fa
--- /dev/null
+++ b/apps/user_ldap/ajax/clearMappings.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * ownCloud - user_ldap
+ *
+ * @author Arthur Schiwon
+ * @copyright 2013 Arthur Schiwon blizzz@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Check user and app status
+OCP\JSON::checkAdminUser();
+OCP\JSON::checkAppEnabled('user_ldap');
+OCP\JSON::callCheck();
+
+$subject = $_POST['ldap_clear_mapping'];
+if(\OCA\user_ldap\lib\Helper::clearMapping($subject)) {
+	OCP\JSON::success();
+} else {
+	$l=OC_L10N::get('user_ldap');
+	OCP\JSON::error(array('message' => $l->t('Failed to clear the mappings.')));
+}
\ No newline at end of file
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 89410b5ef07e821cae7046c55197c98bda73a409..593e846bc03f8dea4514bd05cf32c99672e90717 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -24,7 +24,7 @@
 OCP\App::registerAdmin('user_ldap', 'settings');
 
 $configPrefixes = OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes(true);
-if(count($configPrefixes) == 1) {
+if(count($configPrefixes) === 1) {
 	$connector = new OCA\user_ldap\lib\Connection($configPrefixes[0]);
 	$userBackend  = new OCA\user_ldap\USER_LDAP();
 	$userBackend->setConnector($connector);
@@ -49,7 +49,7 @@ $entry = array(
 	'name' => 'LDAP'
 );
 
-OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
+OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
 if(OCP\App::isEnabled('user_webdavauth')) {
 	OCP\Util::writeLog('user_ldap',
 		'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour',
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index 378957ec4095dba8968f4301d4bbe65860f3c8cb..c0c33a25c75f3b835cfe2697382b7608f65b0a8c 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -1,6 +1,6 @@
 <?php
 
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
-if($state == 'doSet') {
+if($state === 'doSet') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 2fcbf1902ac54b9c65479047b4457ff10c2ee0aa..179451dad69e48cd5ab24b4f12994c69720c58b6 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -18,7 +18,7 @@ if(!is_null($pw)) {
 //detect if we can switch on naming guidelines. We won't do it on conflicts.
 //it's a bit spaghetti, but hey.
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'unset');
-if($state == 'unset') {
+if($state === 'unset') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
 
@@ -48,7 +48,7 @@ foreach($objects as $object) {
 		$newDN = escapeDN(mb_strtolower($dn['ldap_dn'], 'UTF-8'));
 		if(!empty($dn['directory_uuid'])) {
 			$uuid = $dn['directory_uuid'];
-		} elseif($object == 'user') {
+		} elseif($object === 'user') {
 			$uuid = $userBE->getUUID($newDN);
 			//fix home folder to avoid new ones depending on the configuration
 			$userBE->getHome($dn['owncloud_name']);
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 84ada0832ab52f5ac263a65aaf93dde25e22fa71..185952e14bbdda762f427eee7e42084ed9a9badd 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -11,6 +11,10 @@
 	display: inline-block;
 }
 
+.ldapIndent {
+	margin-left: 50px;
+}
+
 .ldapwarning {
 	margin-left: 1.4em;
 	color: #FF3B3B;
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 432ddd215db6e1d4dcaeaccfefb70fa66c9c4c34..04ff392f9205ab88f692e4994abc47a19b080a6d 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -66,7 +66,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 
 		//extra work if we don't get back user DNs
 		//TODO: this can be done with one LDAP query
-		if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+		if(strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$dns = array();
 			foreach($members as $mid) {
 				$filter = str_replace('%uid', $mid, $this->connection->ldapLoginFilter);
@@ -108,11 +108,11 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		}
 
 		//uniqueMember takes DN, memberuid the uid, so we need to distinguish
-		if((strtolower($this->connection->ldapGroupMemberAssocAttr) == 'uniquemember')
-			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'member')
+		if((strtolower($this->connection->ldapGroupMemberAssocAttr) === 'uniquemember')
+			|| (strtolower($this->connection->ldapGroupMemberAssocAttr) === 'member')
 		) {
 			$uid = $userDN;
-		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid') {
+		} else if(strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$result = $this->readAttribute($userDN, 'uid');
 			$uid = $result[0];
 		} else {
@@ -157,7 +157,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			return $groupUsers;
 		}
 
-		if($limit == -1) {
+		if($limit === -1) {
 			$limit = null;
 		}
 		$groupDN = $this->groupname2dn($gid);
@@ -175,7 +175,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		}
 
 		$groupUsers = array();
-		$isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) == 'memberuid');
+		$isMemberUid = (strtolower($this->connection->ldapGroupMemberAssocAttr) === 'memberuid');
 		foreach($members as $member) {
 			if($isMemberUid) {
 				//we got uids, need to get their DNs to 'tranlsate' them to usernames
diff --git a/apps/user_ldap/group_proxy.php b/apps/user_ldap/group_proxy.php
index 68d2efe38718dd00d1ed9bc8a4610c833f765e50..75e7cd46336328e8320447f6bb9f037ce8ca3aac 100644
--- a/apps/user_ldap/group_proxy.php
+++ b/apps/user_ldap/group_proxy.php
@@ -76,8 +76,15 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 			if(isset($this->backends[$prefix])) {
 				$result = call_user_func_array(array($this->backends[$prefix], $method), $parameters);
 				if(!$result) {
-					//not found here, reset cache to null
-					$this->writeToCache($cacheKey, null);
+					//not found here, reset cache to null if group vanished
+					//because sometimes methods return false with a reason
+					$groupExists = call_user_func_array(
+						array($this->backends[$prefix], 'groupExists'),
+						array($gid)
+					);
+					if(!$groupExists) {
+						$this->writeToCache($cacheKey, null);
+					}
 				}
 				return $result;
 			}
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index e34849ec8878e394b23e90e01acd4996a13d5a74..52d5dbc48d97d85431aacedc3aaa417db30816b0 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -8,13 +8,13 @@ var LdapConfiguration = {
 			OC.filePath('user_ldap','ajax','getConfiguration.php'),
 			$('#ldap_serverconfig_chooser').serialize(),
 			function (result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					$.each(result.configuration, function(configkey, configvalue) {
 						elementID = '#'+configkey;
 
 						//deal with Checkboxes
 						if($(elementID).is('input[type=checkbox]')) {
-							if(configvalue == 1) {
+							if(parseInt(configvalue) === 1) {
 								$(elementID).attr('checked', 'checked');
 							} else {
 								$(elementID).removeAttr('checked');
@@ -37,13 +37,13 @@ var LdapConfiguration = {
 
 	resetDefaults: function() {
 		$('#ldap').find('input[type=text], input[type=number], input[type=password], textarea, select').each(function() {
-			if($(this).attr('id') == 'ldap_serverconfig_chooser') {
+			if($(this).attr('id') === 'ldap_serverconfig_chooser') {
 				return;
 			}
 			$(this).val($(this).attr('data-default'));
 		});
 		$('#ldap').find('input[type=checkbox]').each(function() {
-			if($(this).attr('data-default') == 1) {
+			if($(this).attr('data-default') === 1) {
 				$(this).attr('checked', 'checked');
 			} else {
 				$(this).removeAttr('checked');
@@ -56,7 +56,7 @@ var LdapConfiguration = {
 			OC.filePath('user_ldap','ajax','deleteConfiguration.php'),
 			$('#ldap_serverconfig_chooser').serialize(),
 			function (result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					$('#ldap_serverconfig_chooser option:selected').remove();
 					$('#ldap_serverconfig_chooser option:first').select();
 					LdapConfiguration.refreshConfig();
@@ -74,7 +74,7 @@ var LdapConfiguration = {
 		$.post(
 			OC.filePath('user_ldap','ajax','getNewServerConfigPrefix.php'),
 			function (result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					if(doNotAsk) {
 						LdapConfiguration.resetDefaults();
 					} else {
@@ -99,6 +99,26 @@ var LdapConfiguration = {
 				}
 			}
 		);
+	},
+
+	clearMappings: function(mappingSubject) {
+		$.post(
+			OC.filePath('user_ldap','ajax','clearMappings.php'),
+			'ldap_clear_mapping='+mappingSubject,
+			function(result) {
+				if(result.status == 'success') {
+					OC.dialogs.info(
+						t('user_ldap', 'mappings cleared'),
+						t('user_ldap', 'Success')
+					);
+				} else {
+					OC.dialogs.alert(
+						result.message,
+						t('user_ldap', 'Error')
+					);
+				}
+			}
+		);
 	}
 }
 
@@ -115,7 +135,7 @@ $(document).ready(function() {
 			OC.filePath('user_ldap','ajax','testConfiguration.php'),
 			$('#ldap').serialize(),
 			function (result) {
-				if (result.status == 'success') {
+				if (result.status === 'success') {
 					OC.dialogs.alert(
 						result.message,
 						t('user_ldap', 'Connection test succeeded')
@@ -150,7 +170,7 @@ $(document).ready(function() {
 			$('#ldap').serialize(),
 			function (result) {
 				bgcolor = $('#ldap_submit').css('background');
-				if (result.status == 'success') {
+				if (result.status === 'success') {
 					//the dealing with colors is a but ugly, but the jQuery version in use has issues with rgba colors
 					$('#ldap_submit').css('background', '#fff');
 					$('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
@@ -166,9 +186,19 @@ $(document).ready(function() {
 		);
 	});
 
+	$('#ldap_action_clear_user_mappings').click(function(event) {
+		event.preventDefault();
+		LdapConfiguration.clearMappings('user');
+	});
+
+	$('#ldap_action_clear_group_mappings').click(function(event) {
+		event.preventDefault();
+		LdapConfiguration.clearMappings('group');
+	});
+
 	$('#ldap_serverconfig_chooser').change(function(event) {
 		value = $('#ldap_serverconfig_chooser option:selected:first').attr('value');
-		if(value == 'NEW') {
+		if(value === 'NEW') {
 			LdapConfiguration.addConfiguration(false);
 		} else {
 			LdapConfiguration.refreshConfig();
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 4d7b7ac4ade26c6a187b92dce01b2ad567e68f68..5f8b6b8145514e00aabda1c4908a04848c0c0544 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "فشل الحذف",
+"Error" => "خطأ",
 "Password" => "كلمة المرور",
 "Help" => "المساعدة"
 );
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index c064534a6b8a16924045f7478c423f53d0d50ece..0330046d80e00c6018e5b427823472148acbc26f 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Грешка",
 "Password" => "Парола",
 "Help" => "Помощ"
 );
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 69dfc8961792f1c28f914ec45f4b8907398869e6..4cee35777df353a724ad0ed574a27d7ede63f7ff 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "সমস্যা",
 "Host" => "হোস্ট",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
 "Base DN" => "ভিত্তি  DN",
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index abdecb164e8f29c1f4bd0487e556ba56743994f7..7f0849b2382e3b5c9616c7e219652ea3a8d6bd3a 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
 "Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
 "The configuration is valid and the connection could be established!" => "La configuració és vàlida i s'ha pogut establir la comunicació!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
 "Keep settings?" => "Voleu mantenir la configuració?",
 "Cannot add server configuration" => "No es pot afegir la configuració del servidor",
+"mappings cleared" => "s'han eliminat els mapatges",
+"Success" => "Èxit",
+"Error" => "Error",
 "Connection test succeeded" => "La prova de connexió ha reeixit",
 "Connection test failed" => "La prova de connexió ha fallat",
 "Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuració actual del servidor?",
@@ -15,7 +19,7 @@
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
 "Server configuration" => "Configuració del servidor",
 "Add Server Configuration" => "Afegeix la configuració del servidor",
-"Host" => "Màquina",
+"Host" => "Equip remot",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
 "Base DN" => "DN Base",
 "One Base DN per line" => "Una DN Base per línia",
@@ -70,6 +74,16 @@
 "Email Field" => "Camp de correu electrònic",
 "User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+"Internal Username" => "Nom d'usuari intern",
+"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." => "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+"Internal Username Attribute:" => "Atribut nom d'usuari intern:",
+"Override UUID detection" => "Sobrescriu la detecció 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." => "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits).",
+"UUID Attribute:" => "Atribut UUID:",
+"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-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 utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova.",
+"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP",
 "Test Configuration" => "Comprovació de la configuració",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index c5d77026b9e9b317dc7b6a1bbc46ef67d1ef298a..dd7373eb690a66b6d8dbb7bf81712c187b50007e 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -7,6 +7,8 @@
 "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",
+"Success" => "Úspěch",
+"Error" => "Chyba",
 "Connection test succeeded" => "Test spojení byl úspěšný",
 "Connection test failed" => "Test spojení selhal",
 "Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..abe2336b2ba8c9fdbd5e9ca74a0d95030b2746dc
--- /dev/null
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Deletion failed" => "Methwyd dileu",
+"Error" => "Gwall",
+"Password" => "Cyfrinair",
+"Help" => "Cymorth"
+);
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 9329c4e8a2416f1db1fd0993a1d6f28f76f62c0d..0a77f46647977050177d02cbb51c4977986611f4 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Fejl ved sletning",
+"Success" => "Succes",
+"Error" => "Fejl",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
 "Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index e86d877ecd77271a6eeec19dc736072cfb0293aa..f00108184214f9c959315ec7100f66ce7316d276 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,31 +1,33 @@
 <?php $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
-"The configuration is valid and the connection could be established!" => "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, bitte sehen Sie für weitere Details im ownCloud Log nach",
+"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfe die Servereinstellungen und Anmeldeinformationen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sieh für weitere Details bitte im ownCloud Log nach",
 "Deletion failed" => "Löschen fehlgeschlagen",
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
-"Cannot add server configuration" => "Serverkonfiguration konnte nicht hinzugefügt werden.",
+"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolgreich",
+"Error" => "Fehler",
 "Connection test succeeded" => "Verbindungstest erfolgreich",
 "Connection test failed" => "Verbindungstest fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?",
+"Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
 "Confirm Deletion" => "Löschung bestätigen",
-"<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." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<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." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
 "Base DN" => "Basis-DN",
-"One Base DN per line" => "Ein Base DN pro Zeile",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-DN",
 "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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer.",
 "Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lasse die Felder von DN und Passwort für anonymen Zugang leer.",
+"For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
 "User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer-Filter-Liste",
 "Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
@@ -54,13 +56,13 @@
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
 "Base User Tree" => "Basis-Benutzerbaum",
-"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
 "User Search Attributes" => "Benutzersucheigenschaften",
-"Optional; one attribute per line" => "Optional; eine Eigenschaft pro Zeile",
+"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
 "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
 "Base Group Tree" => "Basis-Gruppenbaum",
-"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
 "Group Search Attributes" => "Gruppensucheigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Special Attributes" => "Spezielle Eigenschaften",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 3b5d60387a6409754d2daf65064f5d290b749c8b..8aa64477e41bcf2cc13d05d7394a09b243f38d07 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,31 +1,33 @@
 <?php $TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Das Löschen der Server-Konfiguration schlug fehl",
+"Failed to delete the server configuration" => "Löschen der Serverkonfiguration fehlgeschlagen",
 "The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach",
 "Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?",
-"Keep settings?" => "Einstellungen behalten?",
+"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
+"Keep settings?" => "Einstellungen beibehalten?",
 "Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
+"Success" => "Erfolg",
+"Error" => "Fehler",
 "Connection test succeeded" => "Verbindungstest erfolgreich",
 "Connection test failed" => "Verbindungstest fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Möchten Sie die Serverkonfiguration wirklich löschen?",
+"Do you really want to delete the current Server Configuration?" => "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
 "Confirm Deletion" => "Löschung bestätigen",
-"<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." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+"<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." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Server configuration" => "Serverkonfiguration",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
 "Base DN" => "Basis-DN",
-"One Base DN per line" => "Ein Base DN pro Zeile",
+"One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-DN",
 "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." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
 "Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder von DN und Passwort für einen anonymen Zugang leer.",
+"For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
 "User Login Filter" => "Benutzer-Login-Filter",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\"",
 "User List Filter" => "Benutzer-Filter-Liste",
 "Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
@@ -37,12 +39,12 @@
 "Configuration Active" => "Konfiguration aktiv",
 "When unchecked, this configuration will be skipped." => "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
 "Port" => "Port",
-"Backup (Replica) Host" => "Back-Up (Replikation) Host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup-Host an. Es muss ein Replikat des Haupt-LDAP/AD Servers sein.",
-"Backup (Replica) Port" => "Back-Up (Replikation) Port",
+"Backup (Replica) Host" => "Backup Host (Kopie)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
+"Backup (Replica) Port" => "Backup Port",
 "Disable Main Server" => "Hauptserver deaktivieren",
-"When switched on, ownCloud will only connect to the replica server." => "Wenn eingeschaltet, wird sich die ownCloud nur mit dem Replikat-Server verbinden.",
-"Use TLS" => "Benutze TLS",
+"When switched on, ownCloud will only connect to the replica server." => "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden.",
+"Use TLS" => "Nutze TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen.",
 "Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
 "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
@@ -50,26 +52,30 @@
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
 "Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
-"Directory Settings" => "Verzeichniseinstellungen",
+"Directory Settings" => "Ordnereinstellungen",
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
 "Base User Tree" => "Basis-Benutzerbaum",
-"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
-"User Search Attributes" => "Eigenschaften der Benutzer-Suche",
+"One User Base DN per line" => "Ein Benutzer Basis-DN pro Zeile",
+"User Search Attributes" => "Benutzersucheigenschaften",
 "Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
 "Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
 "Base Group Tree" => "Basis-Gruppenbaum",
-"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
-"Group Search Attributes" => "Eigenschaften der Gruppen-Suche",
+"One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
+"Group Search Attributes" => "Gruppensucheigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
-"Special Attributes" => "Besondere Eigenschaften",
+"Special Attributes" => "Spezielle Eigenschaften",
 "Quota Field" => "Kontingent-Feld",
 "Quota Default" => "Standard-Kontingent",
 "in bytes" => "in Bytes",
 "Email Field" => "E-Mail-Feld",
 "User Home Folder Naming Rule" => "Benennungsregel für das Home-Verzeichnis des Benutzers",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
+"Internal Username" => "Interner Benutzername",
+"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." => "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+"Override UUID detection" => "UUID-Erkennung überschreiben",
+"UUID Attribute:" => "UUID-Attribut:",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 96ec818043720609a18b29cc0732afe1422ca3fe..acecf27125f1a2287c37402ca570016dd5c68539 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -4,8 +4,11 @@
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Μη έγκυρες ρυθμίσεις. Παρακαλώ ελέγξτε τις καταγραφές του ownCloud για περισσότερες λεπτομέρειες.",
 "Deletion failed" => "Η διαγραφή απέτυχε",
+"Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
 "Keep settings?" => "Διατήρηση ρυθμίσεων;",
 "Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+"Success" => "Επιτυχία",
+"Error" => "Σφάλμα",
 "Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
 "Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.",
 "Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
@@ -17,6 +20,7 @@
 "Host" => "Διακομιστής",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
 "Base DN" => "Base DN",
+"One Base DN per line" => "Ένα DN Βάσης ανά γραμμή ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
 "User DN" => "User DN",
 "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." => "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
@@ -32,22 +36,42 @@
 "Defines the filter to apply, when retrieving groups." => "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\".",
 "Connection Settings" => "Ρυθμίσεις Σύνδεσης",
+"Configuration Active" => "Ενεργοποιηση ρυθμισεων",
+"When unchecked, this configuration will be skipped." => "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
 "Port" => "Θύρα",
+"Backup (Replica) Host" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Host ",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη.",
+"Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
+"Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη",
+"When switched on, ownCloud will only connect to the replica server." => "Όταν ενεργοποιηθεί, με το ownCloud θα συνδεθείτε με το διακομιστή ρεπλίκα.",
 "Use TLS" => "Χρήση TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
 "Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας.",
 "Not recommended, use for testing only." => "Δεν προτείνεται, χρήση μόνο για δοκιμές.",
+"Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
 "Directory Settings" => "Ρυθμίσεις Καταλόγου",
 "User Display Name Field" => "Πεδίο Ονόματος Χρήστη",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud.",
 "Base User Tree" => "Base User Tree",
+"One User Base DN per line" => "Ένα DN βάσης χρηστών ανά γραμμή",
+"User Search Attributes" => "Χαρακτηριστικά αναζήτησης των χρηστών ",
+"Optional; one attribute per line" => "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή ",
 "Group Display Name Field" => "Group Display Name Field",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud.",
 "Base Group Tree" => "Base Group Tree",
+"One Group Base DN per line" => "Μια ομαδικη Βάση DN ανά γραμμή",
+"Group Search Attributes" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
 "Group-Member association" => "Group-Member association",
+"Special Attributes" => "Ειδικά Χαρακτηριστικά ",
+"Quota Field" => "Ποσοσταση πεδιου",
+"Quota Default" => "Προκαθισμενο πεδιο",
 "in bytes" => "σε bytes",
+"Email Field" => "Email τυπος",
+"User Home Folder Naming Rule" => "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας ",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.",
+"Test Configuration" => "Δοκιμαστικες ρυθμισεις",
 "Help" => "Βοήθεια"
 );
diff --git a/apps/user_ldap/l10n/en@pirate.php b/apps/user_ldap/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c
--- /dev/null
+++ b/apps/user_ldap/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Passcode"
+);
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 3ffcbddb3e3652e6d2696ed333520bef2b883414..c9a9ba130c6fbd2c9bcaa49127fb61f473c6b490 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Forigo malsukcesis",
+"Success" => "Sukceso",
+"Error" => "Eraro",
 "Host" => "Gastigo",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
 "Base DN" => "Bazo-DN",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 098e16a5d130034a571ed6316d16852859322540..31d43288e5bc0ce25e6ea3bbd5bf8eb158f1b65c 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,17 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Ocurrió un fallo al borrar las asignaciones.",
 "Failed to delete the server configuration" => "No se pudo borrar la configuración del servidor",
 "The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión puede establecerse!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero falló el Enlace. Por favor, compruebe 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, busque en el log de ownCloud para más detalles.",
 "Deletion failed" => "Falló el borrado",
-"Take over settings from recent server configuration?" => "Hacerse cargo de los ajustes de configuración del servidor reciente?",
+"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
 "Keep settings?" => "Mantener la configuración?",
 "Cannot add server configuration" => "No se puede añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
+"Success" => "Éxito",
+"Error" => "Error",
 "Connection test succeeded" => "La prueba de conexión fue exitosa",
 "Connection test failed" => "La prueba de conexión falló",
 "Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
 "Confirm Deletion" => "Confirmar eliminación",
-"<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." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
+"<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." => "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
 "Server configuration" => "Configuración del Servidor",
 "Add Server Configuration" => "Agregar configuracion del servidor",
@@ -26,30 +30,30 @@
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
 "User Login Filter" => "Filtro de inicio de sesión de usuario",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como placeholder, ej: \"uid=%%uid\"",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como comodín, ej: \"uid=%%uid\"",
 "User List Filter" => "Lista de filtros de usuario",
 "Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Sin placeholder, ej: \"objectClass=person\".",
+"without any placeholder, e.g. \"objectClass=person\"." => "Sin comodines, ej: \"objectClass=person\".",
 "Group Filter" => "Filtro de grupo",
 "Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Con cualquier placeholder, ej: \"objectClass=posixGroup\".",
-"Connection Settings" => "Configuracion de coneccion",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "sin comodines, ej: \"objectClass=posixGroup\".",
+"Connection Settings" => "Configuración de conexión",
 "Configuration Active" => "Configuracion activa",
 "When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
 "Port" => "Puerto",
-"Backup (Replica) Host" => "Host para backup (Replica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
-"Backup (Replica) Port" => "Puerto para backup (Replica)",
+"Backup (Replica) Host" => "Servidor de copia de seguridad (Replica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
 "Disable Main Server" => "Deshabilitar servidor principal",
-"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica",
+"When switched on, ownCloud will only connect to the replica server." => "Cuando se inicie, ownCloud unicamente conectará al servidor replica",
 "Use TLS" => "Usar TLS",
-"Do not use it additionally for LDAPS connections, it will fail." => "No usar adicionalmente para conecciones LDAPS, estas fallaran",
-"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
+"Do not use it additionally for LDAPS connections, it will fail." => "No lo use para conexiones LDAPS, Fallará.",
+"Case insensitve LDAP server (Windows)" => "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)",
 "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
 "Cache Time-To-Live" => "Cache TTL",
-"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la cache.",
+"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
 "Directory Settings" => "Configuracion de directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
@@ -70,6 +74,16 @@
 "Email Field" => "E-mail",
 "User Home Folder Naming Rule" => "Regla para la carpeta Home 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, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nombre de usuario interno",
+"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 de usuario interno será creado desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En 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 quitados. En coincidencias un número será añadido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es también el nombre por defecto para la carpeta 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 a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. Déjalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
+"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 autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo 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 utiliza 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é más bien 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. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar 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" => "Configuración de prueba",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index c8aec0cd41ba2d901ffdb5920182e2bc03aa2a3b..98fb32b1d26e902e19b819bf0e4c2aa506ec2fdd 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -7,6 +7,8 @@
 "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",
+"Success" => "Éxito",
+"Error" => "Error",
 "Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
 "Connection test failed" => "Falló es test de conexión",
 "Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 665e9d6fa2c2ebf1c21025e5acabdf2783f677ce..39346def039f056196426f3f0965df2cb217b9c1 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Vastendususte puhastamine ebaõnnestus.",
 "Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
 "The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Seadistus on vigane. Palun vaata ownCloud logist täpsemalt.",
 "Deletion failed" => "Kustutamine ebaõnnestus",
 "Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
-"Keep settings?" => "Säilitada seadistus?",
+"Keep settings?" => "Säilitada seadistused?",
 "Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
-"Connection test succeeded" => "Test ühendus õnnestus",
-"Connection test failed" => "Test ühendus ebaõnnestus",
+"mappings cleared" => "vastendused puhastatud",
+"Success" => "Korras",
+"Error" => "Viga",
+"Connection test succeeded" => "Ühenduse testimine õnnestus",
+"Connection test failed" => "Ühenduse testimine ebaõnnestus",
 "Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
 "Confirm Deletion" => "Kinnita kustutamine",
 "<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." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
@@ -39,10 +43,10 @@
 "Port" => "Port",
 "Backup (Replica) Host" => "Varuserver",
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga.",
-"Backup (Replica) Port" => "Varuserveri (replika) ldap port",
+"Backup (Replica) Port" => "Varuserveri (replika) port",
 "Disable Main Server" => "Ära kasuta peaserverit",
 "When switched on, ownCloud will only connect to the replica server." => "Märgituna ownCloud ühendub ainult varuserverisse.",
-"Use TLS" => "Kasutaja TLS",
+"Use TLS" => "Kasuta TLS-i",
 "Do not use it additionally for LDAPS connections, it will fail." => "LDAPS puhul ära kasuta. Ühendus ei toimi.",
 "Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)",
 "Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
@@ -70,6 +74,16 @@
 "Email Field" => "Email atribuut",
 "User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+"Internal Username" => "Sisemine kasutajanimi",
+"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." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
+"Override UUID detection" => "Tühista UUID tuvastus",
+"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." => "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud).",
+"UUID Attribute:" => "UUID atribuut:",
+"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
+"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 kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus",
 "Test Configuration" => "Testi seadistust",
 "Help" => "Abiinfo"
 );
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 5e9fd014c64f3a5875ea41d396007b1a078e0e67..42f184e53902efa1b5af5bec74247e2a255bf8ed 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
 "Keep settings?" => "Mantendu ezarpenak?",
 "Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu",
+"Success" => "Arrakasta",
+"Error" => "Errorea",
 "Connection test succeeded" => "Konexio froga ongi burutu da",
 "Connection test failed" => "Konexio frogak huts egin du",
 "Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index 9a01a67703decb41720fff28b0d9c3d2058cb605..bef13457adb7cc80bae02c2464a5aa7a84aa7e71 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -3,6 +3,7 @@
 "The configuration is valid and the connection could be established!" => "پیکربندی معتبر است و ارتباط می تواند برقرار شود",
 "Deletion failed" => "حذف کردن انجام نشد",
 "Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
+"Error" => "خطا",
 "Connection test succeeded" => "تست اتصال با موفقیت انجام گردید",
 "Connection test failed" => "تست اتصال ناموفق بود",
 "Do you really want to delete the current Server Configuration?" => "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
@@ -10,7 +11,7 @@
 "Server configuration" => "پیکربندی سرور",
 "Add Server Configuration" => "افزودن پیکربندی سرور",
 "Host" => "میزبانی",
-"Password" => "رمز عبور",
+"Password" => "گذرواژه",
 "Group Filter" => "فیلتر گروه",
 "Port" => "درگاه",
 "in bytes" => "در بایت",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 38ecb5d82a882f55dfa576ca8305aa0793c222db..38a8b99cf7e5424a0fd82fba75cb240869b265a3 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -2,6 +2,8 @@
 "Deletion failed" => "Poisto epäonnistui",
 "Keep settings?" => "Säilytetäänkö asetukset?",
 "Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
+"Success" => "Onnistui!",
+"Error" => "Virhe",
 "Connection test succeeded" => "Yhteystesti onnistui",
 "Connection test failed" => "Yhteystesti epäonnistui",
 "Confirm Deletion" => "Vahvista poisto",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 990658e147e03936cc94bdafb802a0bb518817de..11f8fbaaf4483ec1f1fb8507a81f8c0f946f7505 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
 "Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
-"The configuration is valid and the connection could be established!" => "La configuration est valide est la connexion peut être établie !",
+"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "La configuration est invalide. Veuillez vous référer aux fichiers de journaux ownCloud pour plus d'information.",
 "Deletion failed" => "La suppression a échoué",
 "Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
 "Keep settings?" => "Garder ces paramètres ?",
-"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur.",
+"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
+"mappings cleared" => "associations supprimées",
+"Success" => "Succès",
+"Error" => "Erreur",
 "Connection test succeeded" => "Test de connexion réussi",
-"Connection test failed" => "Le test de connexion a échoué",
+"Connection test failed" => "Test de connexion échoué",
 "Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
 "Confirm Deletion" => "Confirmer la suppression",
 "<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." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
@@ -17,13 +21,13 @@
 "Add Server Configuration" => "Ajouter une configuration du serveur",
 "Host" => "Hôte",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
-"Base DN" => "DN Racine",
+"Base DN" => "DN racine",
 "One Base DN per line" => "Un DN racine par ligne",
 "You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
 "User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
 "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." => "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
 "Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
 "User Login Filter" => "Modèle d'authentification utilisateurs",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\"",
@@ -66,10 +70,20 @@
 "Special Attributes" => "Attributs spéciaux",
 "Quota Field" => "Champ du quota",
 "Quota Default" => "Quota par défaut",
-"in bytes" => "en octets",
+"in bytes" => "en bytes",
 "Email Field" => "Champ Email",
 "User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
+"Internal Username" => "Nom d'utilisateur interne",
+"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." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+"Internal Username Attribute:" => "Nom d'utilisateur interne:",
+"Override UUID detection" => "Surcharger la détection d'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." => "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
+"UUID Attribute:" => "Attribut UUID :",
+"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur 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 utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation.",
+"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP",
 "Test Configuration" => "Tester la configuration",
 "Help" => "Aide"
 );
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index deb6dbb5553a2e395c758588eaefb2eb8a0672c0..3f44ccd9bd1a0a95a2b87ec43f4dd1894f7a9897 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,12 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Non foi posíbel limpar as asignacións.",
 "Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
 "The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles",
-"Deletion failed" => "Fallou o borrado",
+"Deletion failed" => "Produciuse un fallo ao eliminar",
 "Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
 "Keep settings?" => "Manter os axustes?",
 "Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
+"mappings cleared" => "limpadas as asignacións",
+"Success" => "Correcto",
+"Error" => "Erro",
 "Connection test succeeded" => "A proba de conexión foi satisfactoria",
 "Connection test failed" => "A proba de conexión fracasou",
 "Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?",
@@ -70,6 +74,16 @@
 "Email Field" => "Campo do correo",
 "User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
+"Internal Username" => "Nome de usuario interno",
+"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." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"Internal Username Attribute:" => "Atributo do nome de usuario interno:",
+"Override UUID detection" => "Ignorar a detección do 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." => "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+"UUID Attribute:" => "Atributo do UUID:",
+"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de 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 utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»",
 "Test Configuration" => "Probar a configuración",
 "Help" => "Axuda"
 );
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index c9b0e282f1d26908fa3ab55e391f036f8083f1de..0d60768dcfccc232f58642638c133aceed661bce 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -1,5 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "מחיקה נכשלה",
+"Keep settings?" => "האם לשמור את ההגדרות?",
+"Cannot add server configuration" => "לא ניתן להוסיף את הגדרות השרת",
+"Error" => "שגיאה",
+"Connection test succeeded" => "בדיקת החיבור עברה בהצלחה",
+"Connection test failed" => "בדיקת החיבור נכשלה",
+"Do you really want to delete the current Server Configuration?" => "האם אכן למחוק את הגדרות השרת הנוכחיות?",
+"Confirm Deletion" => "אישור המחיקה",
+"Server configuration" => "הגדרות השרת",
+"Add Server Configuration" => "הוספת הגדרות השרת",
 "Host" => "מארח",
 "User DN" => "DN משתמש",
 "Password" => "סיסמא",
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 60d4ea98e84abe1a2062f5e57fab5dc6f727d98d..45166eb0e3e893844d3a3ad02fd4d7537230ad4e 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Password" => "पासवर्ड",
 "Help" => "सहयोग"
 );
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index 91503315066c42bb31391ed0f1ea03a8c3fb95b3..cc8918301f5e955b179f81bc7e044cf75e0f304c 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Greška",
+"Password" => "Lozinka",
 "Help" => "Pomoć"
 );
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index a82a64ab32f1387660ebfb3b93c38cf19f6db002..361ae5e0403152cb86e1aad06104744065fc636e 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nem sikerült törölni a hozzárendeléseket.",
 "Failed to delete the server configuration" => "Nem sikerült törölni a kiszolgáló konfigurációját",
 "The configuration is valid and the connection could be established!" => "A konfiguráció érvényes, és a kapcsolat létrehozható!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Vegyük át a beállításokat az előző konfigurációból?",
 "Keep settings?" => "Tartsuk meg a beállításokat?",
 "Cannot add server configuration" => "Az új  kiszolgáló konfigurációja nem hozható létre",
+"mappings cleared" => "Töröltük a hozzárendeléseket",
+"Success" => "Sikeres végrehajtás",
+"Error" => "Hiba",
 "Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
 "Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
 "Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?",
@@ -70,6 +74,13 @@
 "Email Field" => "Email mező",
 "User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
+"Internal Username" => "Belső felhasználónév",
+"Internal Username Attribute:" => "A belső felhasználónév attribútuma:",
+"Override UUID detection" => "Az UUID-felismerés felülbírálása",
+"UUID Attribute:" => "UUID attribútum:",
+"Username-LDAP User Mapping" => "Felhasználó - LDAP felhasználó hozzárendelés",
+"Clear Username-LDAP User Mapping" => "A felhasználó - LDAP felhasználó hozzárendelés törlése",
+"Clear Groupname-LDAP Group Mapping" => "A csoport - LDAP csoport hozzárendelés törlése",
 "Test Configuration" => "A beállítások tesztelése",
 "Help" => "Súgó"
 );
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index 3586bf5a2e74cb7ea0cec1f9979b5ca872777621..624fd4fa0eb460d3e1053c539407864a390208ed 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Error",
+"Password" => "Contrasigno",
 "Help" => "Adjuta"
 );
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 1f6d8fcffe37b645b22e5b31916ffed630b20e1d..c04d09fc671b0f531b856845cf33e5f5f27480fc 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -3,10 +3,12 @@
 "The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya.",
-"Deletion failed" => "penghapusan gagal",
+"Deletion failed" => "Penghapusan gagal",
 "Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?",
 "Keep settings?" => "Biarkan pengaturan?",
 "Cannot add server configuration" => "Gagal menambah konfigurasi server",
+"Success" => "Sukses",
+"Error" => "Galat",
 "Connection test succeeded" => "Tes koneksi sukses",
 "Connection test failed" => "Tes koneksi gagal",
 "Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
@@ -15,14 +17,14 @@
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
 "Server configuration" => "Konfigurasi server",
 "Add Server Configuration" => "Tambah Konfigurasi Server",
-"Host" => "host",
+"Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
 "Base DN" => "Base DN",
 "One Base DN per line" => "Satu Base DN per baris",
 "You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
 "User DN" => "User DN",
 "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." => "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
-"Password" => "kata kunci",
+"Password" => "Sandi",
 "For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
 "User Login Filter" => "gunakan saringan login",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login.",
@@ -71,5 +73,5 @@
 "User Home Folder Naming Rule" => "Aturan Penamaan Folder Home Pengguna",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
 "Test Configuration" => "Uji Konfigurasi",
-"Help" => "bantuan"
+"Help" => "Bantuan"
 );
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index 29bc769279588e25bbe41e52870b0dd4c362851f..dadac9eedaafec867fc819fadf930a242865807a 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Villa",
 "Host" => "Netþjónn",
 "Password" => "Lykilorð",
 "Help" => "Hjálp"
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index a2790fd1dec60f2a6e4079930e25590b93878d89..48bcbdf589a17a16d42851bf96b822ef165a759e 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
 "Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
 "The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
 "Keep settings?" => "Vuoi mantenere le impostazioni?",
 "Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
+"mappings cleared" => "associazioni cancellate",
+"Success" => "Riuscito",
+"Error" => "Errore",
 "Connection test succeeded" => "Prova di connessione riuscita",
 "Connection test failed" => "Prova di connessione non riuscita",
 "Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
@@ -70,6 +74,16 @@
 "Email Field" => "Campo Email",
 "User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+"Internal Username" => "Nome utente interno",
+"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." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+"Internal Username Attribute:" => "Attributo nome utente interno:",
+"Override UUID detection" => "Ignora rilevamento 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." => "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+"UUID Attribute:" => "Attributo UUID:",
+"Username-LDAP User Mapping" => "Associazione Nome utente-Utente 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 utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test.",
+"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP",
 "Test Configuration" => "Prova configurazione",
 "Help" => "Aiuto"
 );
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 3ae7d2e639222326d4e24adcbbb9d434776845e4..53fa9ae697df3760b086c28d249b71168440f19f 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.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,9 @@
 "Take over settings from recent server configuration?" => "最近のサーバ設定から設定を引き継ぎますか？",
 "Keep settings?" => "設定を保持しますか？",
 "Cannot add server configuration" => "サーバ設定を追加できません",
+"mappings cleared" => "マッピングをクリアしました",
+"Success" => "成功",
+"Error" => "エラー",
 "Connection test succeeded" => "接続テストに成功しました",
 "Connection test failed" => "接続テストに失敗しました",
 "Do you really want to delete the current Server Configuration?" => "現在のサーバ設定を本当に削除してもよろしいですか？",
@@ -70,6 +74,16 @@
 "Email Field" => "メールフィールド",
 "User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。",
-"Test Configuration" => "テスト設定",
+"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サービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。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ユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザと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ユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、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/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 0385103f9b8b8f515459dd20969551ef05ed6ab3..8057f7c845550bdb99e486cf344c5dc9dca4b5c6 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -1,6 +1,77 @@
 <?php $TRANSLATIONS = array(
-"Deletion failed" => "წაშლის ველი",
+"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." => "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "კონფიგურაცია არ არის მართებული. გთხოვთ ჩაიხედოთ დეტალური ინფორმაციისთვის ownCloud –ის ლოგში.",
+"Deletion failed" => "წაშლა ვერ განხორციელდა",
+"Take over settings from recent server configuration?" => "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
+"Keep settings?" => "დავტოვოთ პარამეტრები?",
+"Cannot add server configuration" => "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+"Success" => "დასრულდა",
+"Error" => "შეცდომა",
+"Connection test succeeded" => "კავშირის ტესტირება მოხერხდა",
+"Connection test failed" => "კავშირის ტესტირება ვერ მოხერხდა",
+"Do you really want to delete the current Server Configuration?" => "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
+"Confirm Deletion" => "წაშლის დადასტურება",
+"<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." => "<b>გაფრთხილება:</b>  აპლიკაციის user_ldap და user_webdavauth არათავსებადია. თქვენ შეიძლება შეეჩეხოთ მოულოდნელ შშედეგებს. თხოვეთ თქვენს ადმინისტრატორს ჩათიშოს ერთერთი.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის.",
+"Server configuration" => "სერვერის პარამეტრები",
+"Add Server Configuration" => "სერვერის პარამეტრების დამატება",
 "Host" => "ჰოსტი",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
+"Base DN" => "საწყისი DN",
+"One Base DN per line" => "ერთი საწყისი DN ერთ ხაზზე",
+"You can specify Base DN for users and groups in the Advanced tab" => "თქვენ შეგიძლიათ მიუთითოთ საწყისი DN მომხმარებლებისთვის და ჯგუფებისთვის Advanced ტაბში",
+"User DN" => "მომხმარებლის DN",
+"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." => "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი.",
+"Password" => "პაროლი",
+"For anonymous access, leave DN and Password empty." => "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი.",
+"User Login Filter" => "მომხმარებლის ფილტრი",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\"",
+"User List Filter" => "მომხმარებლებიის სიის ფილტრი",
+"Defines the filter to apply, when retrieving users." => "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება.",
+"without any placeholder, e.g. \"objectClass=person\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\".",
+"Group Filter" => "ჯგუფის ფილტრი",
+"Defines the filter to apply, when retrieving groups." => "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\".",
+"Connection Settings" => "კავშირის პარამეტრები",
+"Configuration Active" => "კონფიგურაცია აქტიურია",
+"When unchecked, this configuration will be skipped." => "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
 "Port" => "პორტი",
+"Backup (Replica) Host" => "ბექაფ  (რეპლიკა)  ჰოსტი",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა.",
+"Backup (Replica) Port" => "ბექაფ (რეპლიკა) პორტი",
+"Disable Main Server" => "გამორთეთ ძირითადი სერვერი",
+"When switched on, ownCloud will only connect to the replica server." => "როცა მონიშნულია, ownCloud დაუკავშირდება მხოლოდ რეპლიკა სერვერს.",
+"Use TLS" => "გამოიყენეთ TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება.",
+"Case insensitve LDAP server (Windows)" => "LDAP server (Windows)",
+"Turn off SSL certificate validation." => "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "იმ შემთხვევაში თუ მუშაობს მხოლოდ ეს ოფცია, დააიმპორტეთ LDAP სერვერის SSL სერთიფიკატი თქვენს ownCloud სერვერზე.",
+"Not recommended, use for testing only." => "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ.",
+"Cache Time-To-Live" => "ქეშის სიცოცხლის ხანგრძლივობა",
+"in seconds. A change empties the cache." => "წამებში. ცვლილება ასუფთავებს ქეშს.",
+"Directory Settings" => "დირექტორიის პარამეტრები",
+"User Display Name Field" => "მომხმარებლის დისფლეის სახელის ფილდი",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP ატრიბუტი მომხმარებლის  ownCloud სახელის გენერაციისთვის.",
+"Base User Tree" => "ძირითად მომხმარებელთა სია",
+"One User Base DN per line" => "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე",
+"User Search Attributes" => "მომხმარებლის ძებნის ატრიბუტი",
+"Optional; one attribute per line" => "ოფციონალური; თითო ატრიბუტი თითო ხაზზე",
+"Group Display Name Field" => "ჯგუფის დისფლეის სახელის ფილდი",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP ატრიბუტი ჯგუფის  ownCloud სახელის გენერაციისთვის.",
+"Base Group Tree" => "ძირითად ჯგუფთა სია",
+"One Group Base DN per line" => "ერთი ჯგუფის საწყისი DN ერთ ხაზზე",
+"Group Search Attributes" => "ჯგუფური ძებნის ატრიბუტი",
+"Group-Member association" => "ჯგუფის წევრობის ასოციაცია",
+"Special Attributes" => "სპეციალური ატრიბუტები",
+"Quota Field" => "ქვოტას ველი",
+"Quota Default" => "საწყისი ქვოტა",
+"in bytes" => "ბაიტებში",
+"Email Field" => "იმეილის ველი",
+"User Home Folder Naming Rule" => "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი.",
+"Test Configuration" => "კავშირის ტესტირება",
 "Help" => "დახმარება"
 );
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 8aa9fe74b3d1f513c3c73de5c3b58f0930c2557e..b8196e09d09a93f9e4adf0915b35466de90718b2 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "삭제 실패",
 "Keep settings?" => "설정을 유지합니까?",
+"Error" => "오류",
 "Connection test succeeded" => "연결 시험 성공",
 "Connection test failed" => "연결 시험 실패",
 "<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." => "<b>경고:</b> user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오.",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index 1ae808ddd91007e3b322192016aed9d0c25781ea..00602ae5d79c4b80e14384f64f43c4499fa08486 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Success" => "سه‌رکه‌وتن",
+"Error" => "هه‌ڵه",
+"Password" => "وشەی تێپەربو",
 "Help" => "یارمەتی"
 );
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index 39ed627ce2c92fc3d9a169b91f3d8bfcebcf34e3..cf58c9ec5be9c0ba08f0b2bf0898f229ae1037ff 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Konnt net läschen",
+"Error" => "Fehler",
 "Password" => "Passwuert",
 "Help" => "Hëllef"
 );
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index aa21dd2d3c164aab23dd346d23ec69aee5f62389..6f396847b8efeb640890231ca1ad4c8b979b6407 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "IÅ¡trinti nepavyko",
+"Error" => "Klaida",
 "Password" => "Slaptažodis",
 "Group Filter" => "GrupÄ—s filtras",
 "Port" => "Prievadas",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index 50126664e5be9fc8205e6f80bfb3926551c9a948..73ffedcb134637416ea928d11bbc11911020824b 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -7,6 +7,7 @@
 "Take over settings from recent server configuration?" => "Paņemt iestatījumus no nesenas servera konfigurācijas?",
 "Keep settings?" => "Paturēt iestatījumus?",
 "Cannot add server configuration" => "Nevar pievienot servera konfigurāciju",
+"Error" => "Kļūda",
 "Connection test succeeded" => "Savienojuma tests ir veiksmīgs",
 "Connection test failed" => "Savienojuma tests cieta neveiksmi",
 "Do you really want to delete the current Server Configuration?" => "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 7d34ff49492ec982e3c420ff6561f1fb719c181b..6a060aca415cc55fd885e95b60da06258b2546fe 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Бришењето е неуспешно",
+"Error" => "Грешка",
 "Host" => "Домаќин",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
 "Password" => "Лозинка",
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 17a6cbe2cb6a5f6df2e6ca9fbc2fad2741113fb1..b3004028c58a2c83fff365ee58520103376636cb 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Pemadaman gagal",
+"Error" => "Ralat",
+"Password" => "Kata laluan",
 "Help" => "Bantuan"
 );
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index c4700245f24059f50b3be04e0bd8c061b40d3d5d..f8cdf694ff6f2d392f90dbcda07db766a0cee9aa 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
 "Keep settings?" => "Behold innstillinger?",
 "Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"Success" => "Suksess",
+"Error" => "Feil",
 "Connection test succeeded" => "Tilkoblingstest lyktes",
 "Connection test failed" => "Tilkoblingstest mislyktes",
 "Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 7973c66cd10d8cc3d5dee001a2a04d787aa6d63f..c75aae3ea4f57fe2e0e43cc2d5e1e7af3f8b7ad4 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
 "Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
 "The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
 "Keep settings?" => "Instellingen bewaren?",
 "Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
+"mappings cleared" => "vertaaltabel leeggemaakt",
+"Success" => "Succes",
+"Error" => "Fout",
 "Connection test succeeded" => "Verbindingstest geslaagd",
 "Connection test failed" => "Verbindingstest mislukt",
 "Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
@@ -70,6 +74,16 @@
 "Email Field" => "E-mailveld",
 "User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+"Internal Username" => "Interne gebruikersnaam",
+"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." => "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers.",
+"Internal Username Attribute:" => "Interne gebruikersnaam attribuut:",
+"Override UUID detection" => "Negeren UUID detectie",
+"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." => "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen.",
+"UUID Attribute:" => "UUID Attribuut:",
+"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
+"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 maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving.",
+"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling",
 "Test Configuration" => "Test configuratie",
 "Help" => "Help"
 );
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index 54d1f158f65f05cca5fb71c7d96c5ee838a9f6fe..459100228035b1ecbc424f6fc9bb06e0613ca3a1 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Deletion failed" => "Feil ved sletting",
+"Error" => "Feil",
+"Password" => "Passord",
 "Help" => "Hjelp"
 );
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index a128638172a1c3f77be1bc3e9a5d175d02835f1a..95ab51caadd798298171fce3ddd897a38e458115 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Fracàs d'escafatge",
+"Error" => "Error",
+"Password" => "Senhal",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 776aa445e4eebbf8f32d15ffffd9d553d7b2209b..7edfe0919eba1978e6827feb2f2021ca569de7e5 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,12 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nie udało się wyczyścić mapowania.",
 "Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
 "The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownCloud ",
-"Deletion failed" => "Skasowanie nie powiodło się",
+"Deletion failed" => "Usunięcie nie powiodło się",
 "Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
 "Keep settings?" => "Zachować ustawienia?",
 "Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
+"mappings cleared" => "Mapoanie wyczyszczone",
+"Success" => "Sukces",
+"Error" => "BÅ‚Ä…d",
 "Connection test succeeded" => "Test połączenia udany",
 "Connection test failed" => "Test połączenia nie udany",
 "Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
@@ -70,6 +74,13 @@
 "Email Field" => "Pole email",
 "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",
+"Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
+"Override UUID detection" => "ZastÄ…p wykrywanie UUID",
+"UUID Attribute:" => "Atrybuty UUID:",
+"Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
+"Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP",
 "Test Configuration" => "Konfiguracja testowa",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index a728ea15fde20d9a9e366d70841a6a81f8b61261..22247b81005b43eb620917c4b2f4186963285777 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
 "Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
 "The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
 "Keep settings?" => "Manter ajustes?",
 "Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
+"mappings cleared" => "mapeamentos limpos",
+"Success" => "Sucesso",
+"Error" => "Erro",
 "Connection test succeeded" => "Teste de conexão bem sucedida",
 "Connection test failed" => "Teste de conexão falhou",
 "Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?",
@@ -70,6 +74,16 @@
 "Email Field" => "Campo de Email",
 "User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+"Internal Username" => "Nome de usuário interno",
+"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 padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituídas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. ",
+"Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
+"Override UUID detection" => "Substituir detecção 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 padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
+"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 nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensíveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental.",
+"Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo",
 "Test Configuration" => "Teste de Configuração",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 3092d061437e537618aa08824aab23c5eaadc819..ed1e0f376db9b1daae01a2b2267b09aa278b6ee6 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -7,6 +7,8 @@
 "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.",
+"Success" => "Sucesso",
+"Error" => "Erro",
 "Connection test succeeded" => "Teste de conecção passado com sucesso.",
 "Connection test failed" => "Erro no teste de conecção.",
 "Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
@@ -22,7 +24,7 @@
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
 "User DN" => "DN do utilizador",
 "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." => "O DN to cliente ",
-"Password" => "Palavra-passe",
+"Password" => "Password",
 "For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
 "User Login Filter" => "Filtro de login de utilizador",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado.",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 8f55a35b4916dccc41dc74146411ebcd3200d550..260ee610639b4b0066d0f5f6d76abd803763108a 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Ștergerea a eșuat",
+"Success" => "Succes",
+"Error" => "Eroare",
 "<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." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
 "Host" => "Gazdă",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 0746e1e8929f33876af29823c6d528d77e626199..eed6d373b9f0cad67262378cfb8ddada1e1cf2f5 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
 "Keep settings?" => "Сохранить настройки?",
 "Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
+"Success" => "Успешно",
+"Error" => "Ошибка",
 "Connection test succeeded" => "Проверка соединения удалась",
 "Connection test failed" => "Проверка соединения не удалась",
 "Do you really want to delete the current Server Configuration?" => "Вы действительно хотите удалить существующую конфигурацию сервера?",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index a4ed503b1d12d3646de81295be67ae5e718e9d5f..7b6833ebf8cd2d6827a929379fb7de529b0d18ee 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,42 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Deletion failed" => "Удаление не удалось",
-"<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." => "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> Модуль PHP LDAP не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его.",
-"Host" => "Хост",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://",
-"Base DN" => "База DN",
-"One Base DN per line" => "Одно базовое DN на линию",
-"You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»",
-"User DN" => "DN пользователя",
-"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." => "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми.",
-"Password" => "Пароль",
-"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.",
-"User Login Filter" => "Фильтр имен пользователей",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте %%uid заполнитель, например, \"uid=%%uid\"",
-"User List Filter" => "Фильтр списка пользователей",
-"Defines the filter to apply, when retrieving users." => "Задает фильтр, применяемый при получении пользователей.",
-"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
-"Group Filter" => "Групповой фильтр",
-"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применяемый при получении групп.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
-"Port" => "Порт",
-"Use TLS" => "Использовать TLS",
-"Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру LDAP-сервер (Windows)",
-"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер.",
-"Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
-"in seconds. A change empties the cache." => "в секундах. Изменение очищает кэш.",
-"User Display Name Field" => "Поле, отображаемое как имя пользователя",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
-"Base User Tree" => "Базовое дерево пользователей",
-"One User Base DN per line" => "Одно пользовательское базовое DN на линию",
-"Group Display Name Field" => "Поле, отображаемое как имя группы",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
-"Base Group Tree" => "Базовое дерево групп",
-"One Group Base DN per line" => "Одно групповое базовое DN на линию",
-"Group-Member association" => "Связь член-группа",
-"in bytes" => "в байтах",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.",
-"Help" => "Помощь"
+"Success" => "Успех",
+"Error" => "Ошибка"
 );
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 50124e4d54f1f8f604b32dab2172dfe9b8b8cf13..1d81b341b46242d9567de7ef2b2ac2780f50d70e 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "මකාදැමීම අසාර්ථකයි",
+"Success" => "සාර්ථකයි",
+"Error" => "දෝෂයක්",
 "Host" => "සත්කාරකය",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
 "Password" => "මුර පදය",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index cb55762e64f6beeea256f7a145d1dc5fdeed53dd..e36a1589367219db8f8038a1fd50dbf786dceae1 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Nepodarilo sa vymazať mapovania.",
 "Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
 "The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilné.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
@@ -7,6 +8,9 @@
 "Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
 "Keep settings?" => "Ponechať nastavenia?",
 "Cannot add server configuration" => "Nemožno pridať nastavenie servera",
+"mappings cleared" => "mapovanie vymazané",
+"Success" => "Úspešné",
+"Error" => "Chyba",
 "Connection test succeeded" => "Test pripojenia bol úspešný",
 "Connection test failed" => "Test pripojenia zlyhal",
 "Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazať súčasné nastavenie servera?",
@@ -70,6 +74,11 @@
 "Email Field" => "Pole email",
 "User Home Folder Naming Rule" => "Pravidlo pre nastavenie mena používateľského priečinka dát",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
+"Internal Username" => "Interné používateľské meno",
+"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." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách bude číslo byť pridané / odobrané. Interné používateľské meno sa používa na identifikáciu používateľa interne. Je to tiež predvolený názov používateľského domovského priečinka v ownCloud. To je tiež port vzdialeného URL, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo mapovaných (pridaných) LDAP používateľov.",
+"Internal Username Attribute:" => "Atribút interného používateľského mena:",
+"Override UUID detection" => "Prepísať UUID detekciu",
+"UUID Attribute:" => "UUID atribút:",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 8ff1fd53440eb2d77f168478e17683c3b1eb2e51..1ade5d9b733f3ef7e8dcc11e4d9d8e2d2e6b4a92 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Ali naj se prevzame nastavitve nedavne nastavitve strežnika?",
 "Keep settings?" => "Ali nas se nastavitve ohranijo?",
 "Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika",
+"Success" => "Uspešno končano.",
+"Error" => "Napaka",
 "Connection test succeeded" => "Preizkus povezave je uspešno končan.",
 "Connection test failed" => "Preizkus povezave je spodletel.",
 "Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 24fd869057ddd922bb0a53a40722bf15f0f2dbf2..12324b9f966cfe6fa5ea2caab20182dccafc39d4 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "Veprim i gabuar",
 "Password" => "Kodi",
 "Help" => "Ndihmë"
 );
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index 52569a08ef831d37f4a082678d442192c8a1b414..b94bc83e1e477166237a64ae530da8eec4491de7 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Брисање није успело",
+"Error" => "Грешка",
 "Host" => "Домаћин",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
 "Base DN" => "База DN",
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index 91503315066c42bb31391ed0f1ea03a8c3fb95b3..005a76d4bbc0ea523d4c973ffed057827f6d6536 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Password" => "Lozinka",
 "Help" => "Pomoć"
 );
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 1bb4d9dc0b15b092e961bff2e83d1269701ce14b..eb30bd22f019b24fc08023cf062748f644aa44be 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -7,6 +7,8 @@
 "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",
+"Success" => "Lyckat",
+"Error" => "Fel",
 "Connection test succeeded" => "Anslutningstestet lyckades",
 "Connection test failed" => "Anslutningstestet misslyckades",
 "Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index f6beb3c48630c51f702acdac786cfc320da4ef22..997f09ca8776bb98ad62959ef6df024f749a1dd8 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "நீக்கம் தோல்வியடைந்தது",
+"Error" => "வழு",
 "Host" => "ஓம்புனர்",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
 "Base DN" => "தள DN",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index d9a3e713f034d3bafd328301ad48b6925a02576e..3f047631cf70efdb246ea3fbd13df274b80d07b2 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "పొరపాటు",
 "Password" => "సంకేతపదం",
 "Help" => "సహాయం"
 );
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 802badb2f0304e4352af8874496f64f328087cc4..ec279ba01e5e97dc355cf1642678b572d962129e 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -6,6 +6,8 @@
 "Deletion failed" => "การลบทิ้งล้มเหลว",
 "Keep settings?" => "รักษาการตั้งค่าไว้?",
 "Cannot add server configuration" => "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
+"Success" => "เสร็จสิ้น",
+"Error" => "ข้อผิดพลาด",
 "Connection test succeeded" => "ทดสอบการเชื่อมต่อสำเร็จ",
 "Connection test failed" => "ทดสอบการเชื่อมต่อล้มเหลว",
 "Do you really want to delete the current Server Configuration?" => "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 7bcabb0448a3c8f81dab7e05e39fbae020dd3d62..3835c72313ab32688bcaed94b6669dcc989c3ada 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -1,28 +1,66 @@
 <?php $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
+"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız.",
 "Deletion failed" => "Silme başarısız oldu",
-"Keep settings?" => "Ayarları kalsınmı?",
+"Take over settings from recent server configuration?" => "Ayarları son sunucu yapılandırmalarından devral?",
+"Keep settings?" => "Ayarlar kalsın mı?",
+"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
+"Error" => "Hata",
 "Connection test succeeded" => "Bağlantı testi başarılı oldu",
 "Connection test failed" => "Bağlantı testi başarısız oldu",
+"Do you really want to delete the current Server Configuration?" => "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
 "Confirm Deletion" => "Silmeyi onayla",
+"<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." => "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. ",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak  yuklemek icin.",
+"Server configuration" => "Sunucu uyunlama ",
+"Add Server Configuration" => "Sunucu Uyunlama birlemek ",
 "Host" => "Sunucu",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. ",
 "Base DN" => "Ana DN",
+"One Base DN per line" => "Bir Tabani DN herbir dizi. ",
+"You can specify Base DN for users and groups in the Advanced tab" => "Base DN kullanicileri  ve kaynaklari icin tablosu Advanced tayin etmek ederiz. ",
 "User DN" => "Kullanıcı DN",
+"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." => "DN musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN  ve Parola bos birakmak. ",
 "Password" => "Parola",
 "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
 "User Login Filter" => "Kullanıcı Oturum Filtresi",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. ",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\"",
 "User List Filter" => "Kullanıcı Liste Filtresi",
+"Defines the filter to apply, when retrieving users." => "Filter uyunmak icin tayin ediyor, ne zaman adi  kullanici geri aliyor. ",
 "without any placeholder, e.g. \"objectClass=person\"." => "bir yer tutucusu olmadan, örneğin \"objectClass=person\"",
 "Group Filter" => "Grup Süzgeci",
+"Defines the filter to apply, when retrieving groups." => "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. ",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. ",
 "Connection Settings" => "Bağlantı ayarları",
+"When unchecked, this configuration will be skipped." => "Ne zaman iptal, bu uynnlama isletici ",
 "Port" => "Port",
+"Backup (Replica) Host" => "Sigorta Kopya Cephe ",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Bir kopya cevre vermek, kopya sunucu onemli olmali. ",
+"Backup (Replica) Port" => "Kopya Port ",
 "Disable Main Server" => "Ana sunucuyu devredışı birak",
+"When switched on, ownCloud will only connect to the replica server." => "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis.",
 "Use TLS" => "TLS kullan",
+"Do not use it additionally for LDAPS connections, it will fail." => "Bu LDAPS baglama icin kullamaminiz, basamacak. ",
+"Case insensitve LDAP server (Windows)" => "Dusme sunucu LDAP zor degil. (Windows)",
 "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. ",
 "Not recommended, use for testing only." => "Önerilmez, sadece test için kullanın.",
+"Cache Time-To-Live" => "Cache Time-To-Live ",
 "in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
+"Directory Settings" => "Parametrar Listesin Adresinin ",
+"User Display Name Field" => "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. ",
 "Base User Tree" => "Temel Kullanıcı Ağacı",
+"One User Base DN per line" => "Bir Temel Kullanici DN her dizgi ",
+"User Search Attributes" => "Kategorii Arama Kullanici ",
+"Group Display Name Field" => "Grub Ekrane Alani Adi",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP kullamayin grub adi ownCloud uremek icin. ",
 "Base Group Tree" => "Temel Grup Ağacı",
+"One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ",
+"Group Search Attributes" => "Kategorii Arama Grubu",
 "Group-Member association" => "Grup-Ãœye iÅŸbirliÄŸi",
 "in bytes" => "byte cinsinden",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..8634cdbe1bec1b8ab32e3e0b0895a87eea006e0c
--- /dev/null
+++ b/apps/user_ldap/l10n/ug.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
+"Error" => "خاتالىق",
+"Host" => "باش ئاپپارات",
+"Password" => "ئىم",
+"User Login Filter" => "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى",
+"User List Filter" => "ئىشلەتكۈچى تىزىم سۈزگۈچى",
+"Group Filter" => "گۇرۇپپا سۈزگۈچ",
+"Connection Settings" => "باغلىنىش تەڭشىكى",
+"Configuration Active" => "سەپلىمە ئاكتىپ",
+"Port" => "ئېغىز",
+"Use TLS" => "TLS ئىشلەت",
+"Help" => "ياردەم"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 623d34c98e6a5f3a26b8a8b58b4187a5e95c07d9..f92c6d5894ef6ffd87102c880a45c401f1ff9c90 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "Застосувати налаштування  з останньої конфігурації сервера ?",
 "Keep settings?" => "Зберегти налаштування ?",
 "Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
+"Success" => "Успіх",
+"Error" => "Помилка",
 "Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
 "Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
 "Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 4c606a138081f80fed2752ffeaba5a345108481a..83570a596a24b06d91371aed8ebf8206acc1ce02 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Error" => "ایرر",
 "Password" => "پاسورڈ",
 "Help" => "مدد"
 );
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 4bbb977f36362ff85c5375811920f57e19b753ea..7e598225926a4eff92474a16eeb370f87b3adcca 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "Xóa thất bại",
+"Success" => "Thành công",
+"Error" => "Lá»—i",
 "Host" => "Máy chủ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
 "Base DN" => "DN cơ bản",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
index f5bc41fd46b3df5cf756bc50d09df33f7a78036a..6c60ec64e270aadb8159b4b72f35364b8cabf380 100644
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ b/apps/user_ldap/l10n/zh_CN.GB2312.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "删除失败",
+"Success" => "成功",
+"Error" => "出错",
 "Host" => "主机",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头",
 "Base DN" => "基本判别名",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 1911734805fbba894a2c85335f55fc74282f2df5..7b8389227aec8bf927826bc2b722d104c97c3c2f 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -7,6 +7,8 @@
 "Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？",
 "Keep settings?" => "保留设置吗？",
 "Cannot add server configuration" => "无法添加服务器配置",
+"Success" => "成功",
+"Error" => "错误",
 "Connection test succeeded" => "连接测试成功",
 "Connection test failed" => "连接测试失败",
 "Do you really want to delete the current Server Configuration?" => "您真的想要删除当前服务器配置吗？",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index 190e4eba798e9dafde81516fcd728426558ad291..ba55c4147905453e86c73a362a57fe7998dbe7a9 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Success" => "成功",
+"Error" => "錯誤",
 "Password" => "密碼",
 "Port" => "連接埠",
 "Help" => "幫助"
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 9a12bad07479e0f20cf24d60ad6a114cafbc410d..d01e75356c05efb2de994564d50f465664499367 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Deletion failed" => "移除失敗",
+"Success" => "成功",
+"Error" => "錯誤",
 "Host" => "主機",
 "Password" => "密碼",
 "Port" => "連接阜",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 6d32e9b2ab029cd619b2c7f45c8394f936ad8887..04f73cf01fe96b25895e12bb74b7287e15362c17 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -87,7 +87,7 @@ abstract class Access {
 			for($i=0;$i<$result[$attr]['count'];$i++) {
 				if($this->resemblesDN($attr)) {
 					$values[] = $this->sanitizeDN($result[$attr][$i]);
-				} elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') {
+				} elseif(strtolower($attr) === 'objectguid' || strtolower($attr) === 'guid') {
 					$values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
 				} else {
 					$values[] = $result[$attr][$i];
@@ -317,7 +317,19 @@ abstract class Access {
 			}
 			$ldapname = $ldapname[0];
 		}
-		$intname = $isUser ? $this->sanitizeUsername($uuid) : $this->sanitizeUsername($ldapname);
+
+		if($isUser) {
+			$usernameAttribute = $this->connection->ldapExpertUsernameAttr;
+			if(!emptY($usernameAttribute)) {
+				$username = $this->readAttribute($dn, $usernameAttribute);
+				$username = $username[0];
+			} else {
+				$username = $uuid;
+			}
+			$intname = $this->sanitizeUsername($username);
+		} else {
+			$intname = $ldapname;
+		}
 
 		//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
 		//disabling Cache is required to avoid that the new user is cached as not-existing in fooExists check
@@ -429,8 +441,8 @@ abstract class Access {
 		//while loop is just a precaution. If a name is not generated within
 		//20 attempts, something else is very wrong. Avoids infinite loop.
 		while($attempts < 20){
-			$altName = $name . '_' . uniqid();
-			if(\OCP\User::userExists($altName)) {
+			$altName = $name . '_' . rand(1000,9999);
+			if(!\OCP\User::userExists($altName)) {
 				return $altName;
 			}
 			$attempts++;
@@ -462,7 +474,7 @@ abstract class Access {
 		while($row = $res->fetchRow()) {
 			$usedNames[] = $row['owncloud_name'];
 		}
-		if(!($usedNames) || count($usedNames) == 0) {
+		if(!($usedNames) || count($usedNames) === 0) {
 			$lastNo = 1; //will become name_2
 		} else {
 			natsort($usedNames);
@@ -550,7 +562,7 @@ abstract class Access {
 
 		$sqlAdjustment = '';
 		$dbtype = \OCP\Config::getSystemValue('dbtype');
-		if($dbtype == 'mysql') {
+		if($dbtype === 'mysql') {
 			$sqlAdjustment = 'FROM DUAL';
 		}
 
@@ -574,7 +586,7 @@ abstract class Access {
 
 		$insRows = $res->numRows();
 
-		if($insRows == 0) {
+		if($insRows === 0) {
 			return false;
 		}
 
@@ -656,7 +668,7 @@ abstract class Access {
 		$linkResources = array_pad(array(), count($base), $link_resource);
 		$sr = ldap_search($linkResources, $base, $filter, $attr);
 		$error = ldap_errno($link_resource);
-		if(!is_array($sr) || $error != 0) {
+		if(!is_array($sr) || $error !== 0) {
 			\OCP\Util::writeLog('user_ldap',
 				'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource),
 				\OCP\Util::ERROR);
@@ -724,7 +736,7 @@ abstract class Access {
 					foreach($attr as $key) {
 						$key = mb_strtolower($key, 'UTF-8');
 						if(isset($item[$key])) {
-							if($key != 'dn') {
+							if($key !== 'dn') {
 								$selection[$i][$key] = $this->resemblesDN($key) ?
 									$this->sanitizeDN($item[$key][0])
 									: $item[$key][0];
@@ -816,7 +828,7 @@ abstract class Access {
 	private function combineFilter($filters, $operator) {
 		$combinedFilter = '('.$operator;
 		foreach($filters as $filter) {
-		    if($filter[0] != '(') {
+		    if($filter[0] !== '(') {
 				$filter = '('.$filter.')';
 		    }
 		    $combinedFilter.=$filter;
@@ -857,7 +869,7 @@ abstract class Access {
 	private function getFilterPartForSearch($search, $searchAttributes, $fallbackAttribute) {
 		$filter = array();
 		$search = empty($search) ? '*' : '*'.$search.'*';
-		if(!is_array($searchAttributes) || count($searchAttributes) == 0) {
+		if(!is_array($searchAttributes) || count($searchAttributes) === 0) {
 			if(empty($fallbackAttribute)) {
 				return '';
 			}
@@ -867,7 +879,7 @@ abstract class Access {
 				$filter[] = $attribute . '=' . $search;
 			}
 		}
-		if(count($filter) == 1) {
+		if(count($filter) === 1) {
 			return '('.$filter[0].')';
 		}
 		return $this->combineFilterWithOr($filter);
@@ -893,7 +905,13 @@ abstract class Access {
 	 * @returns true on success, false otherwise
 	 */
 	private function detectUuidAttribute($dn, $force = false) {
-		if(($this->connection->ldapUuidAttribute != 'auto') && !$force) {
+		if(($this->connection->ldapUuidAttribute !== 'auto') && !$force) {
+			return true;
+		}
+
+		$fixedAttribute = $this->connection->ldapExpertUUIDAttr;
+		if(!empty($fixedAttribute)) {
+			$this->connection->ldapUuidAttribute = $fixedAttribute;
 			return true;
 		}
 
@@ -1007,7 +1025,7 @@ abstract class Access {
 	 * @returns string containing the key or empty if none is cached
 	 */
 	private function getPagedResultCookie($base, $filter, $limit, $offset) {
-		if($offset == 0) {
+		if($offset === 0) {
 			return '';
 		}
 		$offset -= $limit;
@@ -1031,7 +1049,7 @@ abstract class Access {
 	 */
 	private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
 		if(!empty($cookie)) {
-			$cachekey = 'lc' . dechex(crc32($base)) . '-' . dechex(crc32($filter)) . '-' .$limit . '-' . $offset;
+			$cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .$limit . '-' . $offset;
 			$cookie = $this->connection->writeToCache($cachekey, $cookie);
 		}
 	}
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 20784570e93925c47184faa51681bfd56c31fc68..31150a5bec57d2c9575e4f3e7af68d82213a6f24 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -65,6 +65,8 @@ class Connection {
 		'ldapAttributesForGroupSearch' => null,
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
+		'ldapExpertUsernameAttr' => null,
+		'ldapExpertUUIDAttr' => null,
 	);
 
 	/**
@@ -99,7 +101,7 @@ class Connection {
 	public function __set($name, $value) {
 		$changed = false;
 		//only few options are writable
-		if($name == 'ldapUuidAttribute') {
+		if($name === 'ldapUuidAttribute') {
 			\OCP\Util::writeLog('user_ldap', 'Set config ldapUuidAttribute to  '.$value, \OCP\Util::DEBUG);
 			$this->config[$name] = $value;
 			if(!empty($this->configID)) {
@@ -265,6 +267,10 @@ class Connection {
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_user_search'));
 			$this->config['ldapAttributesForGroupSearch']
 				= preg_split('/\r\n|\r|\n/', $this->$v('ldap_attributes_for_group_search'));
+			$this->config['ldapExpertUsernameAttr']
+				= $this->$v('ldap_expert_username_attr');
+			$this->config['ldapExpertUUIDAttr']
+				= $this->$v('ldap_expert_uuid_attr');
 
 			$this->configured = $this->validateConfiguration();
 		}
@@ -290,7 +296,6 @@ class Connection {
 			'ldap_group_filter'=>'ldapGroupFilter',
 			'ldap_display_name'=>'ldapUserDisplayName',
 			'ldap_group_display_name'=>'ldapGroupDisplayName',
-
 			'ldap_tls'=>'ldapTLS',
 			'ldap_nocase'=>'ldapNoCase',
 			'ldap_quota_def'=>'ldapQuotaDefault',
@@ -302,7 +307,9 @@ class Connection {
 			'ldap_turn_off_cert_check' => 'turnOffCertCheck',
 			'ldap_configuration_active' => 'ldapConfigurationActive',
 			'ldap_attributes_for_user_search' => 'ldapAttributesForUserSearch',
-			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch'
+			'ldap_attributes_for_group_search' => 'ldapAttributesForGroupSearch',
+			'ldap_expert_username_attr' => 'ldapExpertUsernameAttr',
+			'ldap_expert_uuid_attr' => 'ldapExpertUUIDAttr',
 		);
 		return $array;
 	}
@@ -321,9 +328,9 @@ class Connection {
 		$params = $this->getConfigTranslationArray();
 
 		foreach($config as $parameter => $value) {
-			if(($parameter == 'homeFolderNamingRule'
+			if(($parameter === 'homeFolderNamingRule'
 				|| (isset($params[$parameter])
-					&& $params[$parameter] == 'homeFolderNamingRule'))
+					&& $params[$parameter] === 'homeFolderNamingRule'))
 				&& !empty($value)) {
 				$value = 'attr:'.$value;
 			}
@@ -389,7 +396,7 @@ class Connection {
 		$trans = $this->getConfigTranslationArray();
 		$config = array();
 		foreach($trans as $dbKey => $classKey) {
-			if($classKey == 'homeFolderNamingRule') {
+			if($classKey === 'homeFolderNamingRule') {
 				if(strpos($this->config[$classKey], 'attr:') === 0) {
 					$config[$dbKey] = substr($this->config[$classKey], 5);
 				} else {
@@ -427,7 +434,9 @@ class Connection {
 				'No group filter is specified, LDAP group feature will not be used.',
 				\OCP\Util::INFO);
 		}
-		if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid'))
+		$uuidAttributes = array(
+			'auto', 'entryuuid', 'nsuniqueid', 'objectguid', 'guid');
+		if(!in_array($this->config['ldapUuidAttribute'], $uuidAttributes)
 			&& (!is_null($this->configID))) {
 			\OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto');
 			\OCP\Util::writeLog('user_ldap',
@@ -440,7 +449,7 @@ class Connection {
 		}
 		foreach(array('ldapAttributesForUserSearch', 'ldapAttributesForGroupSearch') as $key) {
 			if(is_array($this->config[$key])
-				&& count($this->config[$key]) == 1
+				&& count($this->config[$key]) === 1
 				&& empty($this->config[$key][0])) {
 				$this->config[$key] = array();
 			}
@@ -503,6 +512,10 @@ class Connection {
 			$configurationOK = false;
 		}
 
+		if(!empty($this->config['ldapExpertUUIDAttr'])) {
+			$this->config['ldapUuidAttribute'] = $this->config['ldapExpertUUIDAttr'];
+		}
+
 		return $configurationOK;
 	}
 
@@ -541,6 +554,8 @@ class Connection {
 			'ldap_configuration_active'			=> 1,
 			'ldap_attributes_for_user_search'	=> '',
 			'ldap_attributes_for_group_search'	=> '',
+			'ldap_expert_username_attr'              => '',
+			'ldap_expert_uuid_attr'             => '',
 		);
 	}
 
@@ -586,14 +601,13 @@ class Connection {
 				$error = null;
 			}
 
-			$error = null;
 			//if LDAP server is not reachable, try the Backup (Replica!) Server
-			if((!$bindStatus && ($error == -1))
+			if((!$bindStatus && ($error !== 0))
 				|| $this->config['ldapOverrideMainServer']
 				|| $this->getFromCache('overrideMainServer')) {
 					$this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']);
 					$bindStatus = $this->bind();
-					if($bindStatus && $error == -1) {
+					if(!$bindStatus && $error === -1) {
 						//when bind to backup server succeeded and failed to main server,
 						//skip contacting him until next cache refresh
 						$this->writeToCache('overrideMainServer', true);
@@ -607,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)) {
@@ -621,10 +639,17 @@ class Connection {
 	 * Binds to LDAP
 	 */
 	public function bind() {
+		static $getConnectionResourceAttempt = false;
 		if(!$this->config['ldapConfigurationActive']) {
 			return false;
 		}
+		if($getConnectionResourceAttempt) {
+			$getConnectionResourceAttempt = false;
+			return false;
+		}
+		$getConnectionResourceAttempt = true;
 		$cr = $this->getConnectionResource();
+		$getConnectionResourceAttempt = false;
 		if(!is_resource($cr)) {
 			return false;
 		}
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 612a088269bec3382b8a659188ef4a2678aed6ea..10ed40ebd6a0ae9b618a7b17636c2b86b3d46c67 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -96,7 +96,38 @@ class Helper {
 			return false;
 		}
 
-		if($res->numRows() == 0) {
+		if($res->numRows() === 0) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Truncate's the given mapping table
+	 *
+	 * @param string $mapping either 'user' or 'group'
+	 * @return boolean true on success, false otherwise
+	 */
+	static public function clearMapping($mapping) {
+		if($mapping === 'user') {
+			$table = '`*PREFIX*ldap_user_mapping`';
+		} else if ($mapping === 'group') {
+			$table = '`*PREFIX*ldap_group_mapping`';
+		} else {
+			return false;
+		}
+
+		if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) {
+			$query = \OCP\DB::prepare('DELETE FROM '.$table);
+		} else {
+			$query = \OCP\DB::prepare('TRUNCATE '.$table);
+		}
+
+
+		$res = $query->execute();
+
+		if(\OCP\DB::isError($res)) {
 			return false;
 		}
 
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 094d11db3d5d55681d968f077da5573dfe78ba89..60ecc0da33df57bf473a71403f14f13ec286ce7c 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -23,20 +23,22 @@
 
 namespace OCA\user_ldap\lib;
 
-class Jobs {
+class Jobs extends \OC\BackgroundJob\TimedJob {
 	static private $groupsFromDB;
 
 	static private $groupBE;
 	static private $connector;
 
+	public function __construct(){
+		$this->interval = self::getRefreshInterval();
+	}
+
+	public function run($argument){
+		Jobs::updateGroups();
+	}
+
 	static public function updateGroups() {
 		\OCP\Util::writeLog('user_ldap', 'Run background job "updateGroups"', \OCP\Util::DEBUG);
-		$lastUpdate = \OCP\Config::getAppValue('user_ldap', 'bgjUpdateGroupsLastRun', 0);
-		if((time() - $lastUpdate) < self::getRefreshInterval()) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – last run too fresh, aborting.', \OCP\Util::DEBUG);
-			//komm runter Werner die Maurer geben ein aus
-			return;
-		}
 
 		$knownGroups = array_keys(self::getKnownGroups());
 		$actualGroups = self::getGroupBE()->getGroups();
@@ -45,7 +47,6 @@ class Jobs {
 			\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.',
 				\OCP\Util::INFO);
-			\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
 			return;
 		}
 
@@ -53,8 +54,6 @@ class Jobs {
 		self::handleCreatedGroups(array_diff($actualGroups, $knownGroups));
 		self::handleRemovedGroups(array_diff($knownGroups, $actualGroups));
 
-		\OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time());
-
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – Finished.', \OCP\Util::DEBUG);
 	}
 
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 05497ae8a3375790a9bd2530f3f46bc338a0fc27..22e2dac6d26bca29705fcb3a3f8bfdf4fe2104de 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -4,7 +4,9 @@
  * ownCloud - user_ldap
  *
  * @author Dominik Schmidt
+ * @author Arthur Schiwon
  * @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de
+ * @copyright 2012-2013 Arthur Schiwon blizzz@owncloud.com
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d3c2c298904305f72af82fc52ddf8e872987e6d7..972970aa3ef11445789bbb51390cffe5c35ec8f6 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -3,6 +3,7 @@
 	<ul>
 		<li><a href="#ldapSettings-1">LDAP Basic</a></li>
 		<li><a href="#ldapSettings-2">Advanced</a></li>
+		<li><a href="#ldapSettings-3">Expert</a></li>
 	</ul>
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
 			print_unescaped('<p class="ldapwarning">'.$l->t('<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.').'</p>');
@@ -14,7 +15,7 @@
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_serverconfig_chooser"><?php p($l->t('Server configuration'));?></label>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
-		<?php if(count($_['serverConfigurationPrefixes']) == 0 ) {
+		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
 			?>
 				<option value="" selected>1. Server</option>');
 			<?php
@@ -85,7 +86,7 @@
 				<p><label for="ldap_group_display_name"><?php p($l->t('Group Display Name Field'));?></label><input type="text" id="ldap_group_display_name" name="ldap_group_display_name" data-default="<?php p($_['ldap_group_display_name_default']); ?>" title="<?php p($l->t('The LDAP attribute to use to generate the groups`s ownCloud name.'));?>" /></p>
 				<p><label for="ldap_base_groups"><?php p($l->t('Base Group Tree'));?></label><textarea id="ldap_base_groups" name="ldap_base_groups" placeholder="<?php p($l->t('One Group Base DN per line'));?>" data-default="<?php p($_['ldap_base_groups_default']); ?>" title="<?php p($l->t('Base Group Tree'));?>"></textarea></p>
 				<p><label for="ldap_attributes_for_group_search"><?php p($l->t('Group Search Attributes'));?></label><textarea id="ldap_attributes_for_group_search" name="ldap_attributes_for_group_search" placeholder="<?php p($l->t('Optional; one attribute per line'));?>" data-default="<?php p($_['ldap_attributes_for_group_search_default']); ?>" title="<?php p($l->t('Group Search Attributes'));?>"></textarea></p>
-				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) p(' selected'); ?>>member (AD)</option></select></p>
+				<p><label for="ldap_group_member_assoc_attribute"><?php p($l->t('Group-Member association'));?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute" data-default="<?php p($_['ldap_group_member_assoc_attribute_default']); ?>" ><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'uniqueMember')) p(' selected'); ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'memberUid')) p(' selected'); ?>>memberUid</option><option value="member"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] === 'member')) p(' selected'); ?>>member (AD)</option></select></p>
 			</div>
 			<h3><?php p($l->t('Special Attributes'));?></h3>
 			<div>
@@ -96,6 +97,17 @@
 			</div>
 		</div>
 	</fieldset>
+	<fieldset id="ldapSettings-3">
+		<p><strong><?php p($l->t('Internal Username'));?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('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.'));?></p>
+		<p class="ldapIndent"><label for="ldap_expert_username_attr"><?php p($l->t('Internal Username Attribute:'));?></label><input type="text" id="ldap_expert_username_attr" name="ldap_expert_username_attr" data-default="<?php p($_['ldap_expert_username_attr_default']); ?>" /></p>
+		<p><strong><?php p($l->t('Override UUID detection'));?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('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.'));?></p>
+		<p class="ldapIndent"><label for="ldap_expert_uuid_attr"><?php p($l->t('UUID Attribute:'));?></label><input type="text" id="ldap_expert_uuid_attr" name="ldap_expert_uuid_attr" data-default="<?php p($_['ldap_expert_uuid_attr_default']); ?>" /></p>
+		<p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
+		<p class="ldapIndent"><?php p($l->t('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.'));?></p>
+		<p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
+	</fieldset>
 	<input id="ldap_submit" type="submit" value="Save" /> <button id="ldap_action_test_connection" name="ldap_action_test_connection"><?php p($l->t('Test Configuration'));?></button> <a href="http://doc.owncloud.org/server/5.0/admin_manual/auth_ldap.html" target="_blank"><img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?></a>
 	</div>
 
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 1277e074714619b9fea87c232a475a8da17cc097..41e2926605e75f04af7702666485ade9ef696f34 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -197,9 +197,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 				//if attribute's value is an absolute path take this, otherwise append it to data dir
 				//check for / at the beginning or pattern c:\ resp. c:/
 				if(
-					'/' == $path[0]
+					'/' === $path[0]
 					|| (3 < strlen($path) && ctype_alpha($path[0])
-						&& $path[1] == ':' && ('\\' == $path[2] || '/' == $path[2]))
+						&& $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
 				) {
 					$homedir = $path;
 				} else {
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 6a75bae3815f0cbdb1b4b416cc9dacc58192d44d..73cc0963182c454ef4d67c392654869b55956565 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -76,8 +76,15 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 			if(isset($this->backends[$prefix])) {
 				$result = call_user_func_array(array($this->backends[$prefix], $method), $parameters);
 				if(!$result) {
-					//not found here, reset cache to null
-					$this->writeToCache($cacheKey, null);
+					//not found here, reset cache to null if user vanished
+					//because sometimes methods return false with a reason
+					$userExists = call_user_func_array(
+						array($this->backends[$prefix], 'userExists'),
+						array($uid)
+					);
+					if(!$userExists) {
+						$this->writeToCache($cacheKey, null);
+					}
 				}
 				return $result;
 			}
@@ -167,7 +174,7 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 		foreach($this->backends as $backend) {
 			$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
 			if (is_array($backendUsers)) {
-				$users = array_merge($users, $backendUsers);
+				$users = $users + $backendUsers;
 			}
 		}
 		return $users;
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
new file mode 100644
index 0000000000000000000000000000000000000000..a3bd703b258e9e8e0dcbe315f738b6fdd3289a7d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bg_BG.php
@@ -0,0 +1,5 @@
+<?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/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..772e084b631c20e7bfc580bcb7a9c99ac8c76ba1
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -0,0 +1,5 @@
+<?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/tr.php b/apps/user_webdavauth/l10n/tr.php
index 4a2f6d2403b5781c4a8bdc51a6cb4c61e27ba82f..c495a39dce57845778cf779a29d66f65894b5055 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Kimlik doğrulaması",
-"URL: http://" => "URL: http://"
+"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
new file mode 100644
index 0000000000000000000000000000000000000000..03ced5f4aa27cb15be74c348234fe0e8ade77c06
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش",
+"URL: http://" => "URL: http://"
+);
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 7a9d767eec11d66605fe40cf9d642f5f080eb1cd..6f94b77ac5794f6a4eaba19d43b687e8b26643ca 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,5 +1,5 @@
 <?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視為無效證件和所有其他回應視為有效證件。"
+"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/autotest.sh b/autotest.sh
index fdf6d2fe098267dd414acd4b573f0b8fd5385d02..4562b3ed08a553cea5671ccf6e9ef266a89f2afe 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -54,6 +54,22 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
 );
 DELIM
 
+cat > ./tests/autoconfig-oci.php <<DELIM
+<?php
+\$AUTOCONFIG = array (
+  'installed' => false,
+  'dbtype' => 'oci',
+  'dbtableprefix' => 'oc_',
+  'adminlogin' => 'admin',
+  'adminpass' => 'admin',
+  'directory' => '$BASEDIR/$DATADIR',
+  'dbuser' => 'oc_autotest',
+  'dbname' => 'XE',
+  'dbhost' => 'localhost',
+  'dbpass' => 'owncloud',
+);
+DELIM
+
 function execute_tests {
 	echo "Setup environment for $1 testing ..."
 	# back to root folder
@@ -77,6 +93,30 @@ function execute_tests {
 	if [ "$1" == "pgsql" ] ; then
 		dropdb -U oc_autotest oc_autotest
 	fi
+	if [ "$1" == "oci" ] ; then
+		echo "drop the database"
+		sqlplus -s -l / as sysdba <<EOF
+			drop user oc_autotest cascade;
+EOF
+
+		echo "create the database"
+		sqlplus -s -l / as sysdba <<EOF
+			create user oc_autotest identified by owncloud;
+			alter user oc_autotest default tablespace users
+			temporary tablespace temp
+			quota unlimited on users;
+			grant create session
+			, create table
+			, create procedure
+			, create sequence
+			, create trigger
+			, create view
+			, create synonym
+			, alter session
+			to oc_autotest;
+			exit;
+EOF
+	fi
 
 	# copy autoconfig
 	cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
@@ -90,15 +130,27 @@ function execute_tests {
 	rm -rf coverage-html-$1
 	mkdir coverage-html-$1
 	php -f enable_all.php
-	phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+	if [ "$1" == "sqlite" ] ; then
+		# coverage only with sqlite - causes segfault on ci.tmit.eu - reason unknown
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+	else
+		phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
+	fi
 }
 
 #
 # start test execution
 #
-execute_tests "sqlite"
-execute_tests 'mysql'
-execute_tests 'pgsql'
+if [ -z "$1" ]
+  then
+	execute_tests "sqlite"
+	execute_tests 'mysql'
+	execute_tests 'pgsql'
+	# we will add oci as soon as it's stable
+	#execute_tests 'oci'
+else
+	execute_tests $1
+fi
 
 #
 # NOTES on mysql:
@@ -111,4 +163,8 @@ execute_tests 'pgsql'
 #  - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
 # local	all	all	trust
 #
-
+# NOTES on oci:
+#  - it's a pure nightmare to install Oracle on a Linux-System
+#  - DON'T TRY THIS AT HOME!
+#  - if you really need it: we feel sorry for you
+#
diff --git a/config/config.sample.php b/config/config.sample.php
index b70b3cf533dd0720ede8321b6423fa142f0c4f8e..72834009201931033319d1e8e69b78ed5346bc00 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -146,8 +146,12 @@ $CONFIG = array(
 "remember_login_cookie_lifetime" => 60*60*24*15,
 
 /* Custom CSP policy, changing this will overwrite the standard policy */
-"custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:",
+"custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",
 
+/* Enable/disable X-Frame-Restriction */
+/* HIGH SECURITY RISK IF DISABLED*/
+"xframe_restriction" => true,
+	
 /* The directory where the user data is stored, default to data in the owncloud
  * directory. The sqlite database is also stored here, when sqlite is used.
  */
diff --git a/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
index 954e22dbd99e8c6dd7091335599abf2d10bf8003..eed4abd19220049cec9dafce3cb10b556ad3c915 100644
Binary files a/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png and b/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ
diff --git a/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
index 64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d..a618b0658666efb69a5d5b1abca91ab1f54270b3 100644
Binary files a/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png and b/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png differ
diff --git a/core/css/images/ui-bg_flat_100_ffffff_40x100.png b/core/css/images/ui-bg_flat_100_ffffff_40x100.png
index ac8b229af950c29356abf64a6c4aa894575445f0..6ebfa5026e220e8bc6f3da8cd6d278af4eaa9f96 100644
Binary files a/core/css/images/ui-bg_flat_100_ffffff_40x100.png and b/core/css/images/ui-bg_flat_100_ffffff_40x100.png differ
diff --git a/core/css/images/ui-bg_flat_10_000000_40x100.png b/core/css/images/ui-bg_flat_10_000000_40x100.png
index abdc01082bf3534eafecc5819d28c9574d44ea89..b10f59cd34249f40aeef06a75f95f536d6635803 100644
Binary files a/core/css/images/ui-bg_flat_10_000000_40x100.png and b/core/css/images/ui-bg_flat_10_000000_40x100.png differ
diff --git a/core/css/images/ui-bg_flat_35_1d2d44_40x100.png b/core/css/images/ui-bg_flat_35_1d2d44_40x100.png
index 904ef14c37d9cff5afe71ef9733141328f22ac3c..2be93e582d8f74bd666d6fed1a2810631b9f667c 100644
Binary files a/core/css/images/ui-bg_flat_35_1d2d44_40x100.png and b/core/css/images/ui-bg_flat_35_1d2d44_40x100.png differ
diff --git a/core/css/images/ui-icons_1d2d44_256x240.png b/core/css/images/ui-icons_1d2d44_256x240.png
index 2a857e4da570dbcfedaecc67f4d1092ba321c0a2..1b1474b1fdf7d4229dbbed444472c2ce5370a8f2 100644
Binary files a/core/css/images/ui-icons_1d2d44_256x240.png and b/core/css/images/ui-icons_1d2d44_256x240.png differ
diff --git a/core/css/images/ui-icons_222222_256x240.png b/core/css/images/ui-icons_222222_256x240.png
index b273ff111d219c9b9a8b96d57683d0075fb7871a..82ef90aabaf90cde6a42f2baad47e63512e57d5a 100644
Binary files a/core/css/images/ui-icons_222222_256x240.png and b/core/css/images/ui-icons_222222_256x240.png differ
diff --git a/core/css/images/ui-icons_ffd27a_256x240.png b/core/css/images/ui-icons_ffd27a_256x240.png
index e117effa3dca24e7978cfc5f8b967f661e81044f..a7ac4ec6580f9c553f7933a625531dc8ebcaf2aa 100644
Binary files a/core/css/images/ui-icons_ffd27a_256x240.png and b/core/css/images/ui-icons_ffd27a_256x240.png differ
diff --git a/core/css/images/ui-icons_ffffff_256x240.png b/core/css/images/ui-icons_ffffff_256x240.png
index 42f8f992c727ddaa617da224a522e463df690387..174be7c2847da9e40c962464520a1ad408f4bdb8 100644
Binary files a/core/css/images/ui-icons_ffffff_256x240.png and b/core/css/images/ui-icons_ffffff_256x240.png differ
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..c300b031afdfd430cd6d362894663831c7e40f39
--- /dev/null
+++ b/core/css/jquery.ocdialog.css
@@ -0,0 +1,48 @@
+.oc-dialog {
+	background: white;
+	color: #333333;
+	border-radius: 3px; box-shadow: 0 0 7px #888888;
+	padding: 15px;
+	z-index: 1000;
+	font-size: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	min-width: 200px;
+}
+.oc-dialog-title {
+	background: white;
+	font-weight: bold;
+	font-size: 110%;
+	margin-bottom: 10px;
+}
+.oc-dialog-content {
+	z-index: 1000;
+	background: white;
+}
+.oc-dialog-separator {
+}
+.oc-dialog-buttonrow {
+	background: white;
+	float: right;
+	position: relative;
+	bottom: 0;
+	display: block;
+	margin-top: 10px;
+}
+
+.oc-dialog-close {
+	position:absolute;
+	top:7px; right:7px;
+	height:20px; width:20px;
+	background:url('../img/actions/delete.svg') no-repeat center;
+}
+
+.oc-dialog-dim {
+	background-color: #000;
+	opacity: .20;filter:Alpha(Opacity=20);
+	z-index: 999;
+	position: absolute;
+	top: 0; left: 0;
+	width: 100%; height: 100%;
+}
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 31c8ef88eb9f763ed96211b3067db09038c47b25..def4e60d74db6694b6516e7c6344e7454c7002c3 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -29,6 +29,12 @@
  	white-space:nowrap;
  }
 
+ ul.multiselectoptions>li>input[type="checkbox"] {
+	margin-top: 3px;
+	margin-right: 5px;
+	margin-left: 3px;
+ }
+
  div.multiselect {
  	display:inline-block;
  	max-width:400px;
@@ -75,4 +81,4 @@
  	padding-bottom:.2em;
  	padding-top:.2em;
  	margin:0;
- }
\ No newline at end of file
+ }
diff --git a/core/css/styles.css b/core/css/styles.css
index 043ca161c75cc12016814ea072a59d91900c4a12..313f89195dfc381502e803c0b7b73d4b24a536b8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -23,13 +23,13 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 #body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em;
  -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
 background:#1d2d44; /* Old browsers */
-background:-moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */
-background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d42)); /* Chrome,Safari4+ */
-background:-webkit-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Chrome10+,Safari5.1+ */
-background:-o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */
-background:-ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */
-background:linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */
-filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ }
+background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ }
 
 #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; }
 .header-right { float:right; vertical-align:middle; padding:0.5em; }
@@ -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,10 +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;
 }
@@ -60,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;
@@ -119,7 +121,7 @@ a.disabled, a.disabled:hover, a.disabled:focus {
 	}
 	.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
 		border:1px solid #1d2d44;
-		background:#1d2d42; color:#bbb; text-shadow:#000 0 -1px 0;
+		background:#1d2d44; color:#bbb; text-shadow:#000 0 -1px 0;
 		-moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
 	}
 
@@ -220,6 +222,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #login #databaseField .infield { padding-left:0; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
+#login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
 
 /* Show password toggle */
 #show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
@@ -245,14 +248,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 #login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
 
-/* Warnings */
-fieldset.warning {
-	padding:8px;
-	color:#b94a48; background-color:#f2dede; border:1px solid #eed3d7;
-	border-radius:5px;
-}
-fieldset.warning legend { color:#b94a48 !important; }
-fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
+/* Warnings, for information */
+.warning {
+	display: block;
+	background-color: #f2dede;
+	color: #b94a48;
+	padding: 8px;
+	margin: 0 7px 5px;
+	border: 1px solid #eed3d7;
+	border-radius: 5px;
+}
+.warning legend,
+.warning a {
+	color: #b94a48 !important;
+	font-weight: bold;
+}
+/* Errors, for grave states */
+li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat;  border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
+.error { color:#FF3B3B; }
 
 /* Alternative Logins */
 #alternative-logins legend { margin-bottom:10px; }
@@ -262,23 +275,46 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
 	position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%;
-	background:#383c43 url('../img/noise.png') repeat; border-right:1px #333 solid;
+	background:#383c43 url('../img/noise.png') repeat;
 	-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
 	overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
 }
-#navigation:hover { overflow-y:auto; }
+#navigation:hover { overflow-y:auto; } /* show scrollbar only on hover */
 #navigation a span {
 	display:block;
 	text-decoration:none; font-size:10px; text-align:center;
 	color:#fff; text-shadow:#000 0 -1px 0;
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5;
 	white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
 }
-	#navigation a:hover, #navigation a:focus { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-	#navigation a.active .icon, #navigation a.active span { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+
+	/* icon opacity and hover effect */
+	#navigation a img,
+	#navigation a span {
+		/* 50% opacity when inactive */
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+		filter: alpha(opacity=50);
+		opacity: .5;
+	}
+	#navigation a:hover img, #navigation a:focus img,
+	#navigation a:hover span, #navigation a:focus span {
+		/* 80% opacity when hovered or focused */
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+		filter: alpha(opacity=80);
+		opacity: .8;
+	}
+	#navigation a.active img,
+	#navigation a.active span {
+		 /* full opacity for the active app */
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+		filter: alpha(opacity=100);
+		opacity: 1;
+	}
+
+	/* positioning */
 	#navigation .icon {
-		display:block; width:32px; height:32px; margin:0 16px 0; padding:8px 0 4px; 	
-		-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5;
+		display:block;
+		width:32px; height:32px;
+		margin:0 16px 0; padding:8px 0 4px;
 	}
 	#navigation li:first-child a { padding-top:16px; }
 
@@ -309,8 +345,8 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
 .center { text-align:center; }
 
 #notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
-#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
-#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
+#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
 tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
 tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
@@ -333,29 +369,41 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
 .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
 .pager li { display:inline-block; }
 
-li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat;  border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
-.error { color:#FF3B3B; }
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
-.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777777; padding-left:25px; background-position:0 0.3em;}
+.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;}
 .separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; }
 
 a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px }
 
-.exception{color:#000000;}
+.exception{color:#000;}
 .exception textarea{width:95%;height:200px;background:#ffe;border:0;}
 
 .ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); }
 .ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); }
-.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#ffffff; }
+.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
 
 /* ---- DIALOGS ---- */
-#dirup {width:4%;}
-#dirtree {width:92%;}
-#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
-.filepicker_element_selected { background-color:lightblue;}
-.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;}
+#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
+#oc-dialog-filepicker-content .dirtree .home {
+	background-image:url('../img/places/home.svg');
+	background-repeat:no-repeat;
+	background-position: left center;
+}
+#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
+#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
+#oc-dialog-filepicker-content .filelist {
+	overflow-y:auto;
+	max-height: 300px;
+	background-color:white;
+	width:100%;
+}
+#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
+#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
+#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
 .ui-dialog {position:fixed !important;}
 span.ui-icon {float: left; margin: 3px 7px 30px 0;}
+.loading { background: url('../img/loading.gif') no-repeat center; cursor: wait; }
 
 /* ---- CATEGORIES ---- */
 #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; }
@@ -367,7 +415,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 #category_addinput { width:10em; }
 
 /* ---- APP SETTINGS ---- */
-.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888888; color:#333333; padding:10px; position:fixed !important; z-index:200; }
+.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
 .popup.topright { top:7em; right:1em; }
 .popup.bottomleft { bottom:1em; left:33em; }
 .popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/delete.svg') no-repeat center; }
@@ -414,7 +462,8 @@ div.crumb a{ padding: 0.9em 0 0.7em 0; }
 	-moz-box-sizing: border-box; box-sizing: border-box;
 	text-shadow: 0 1px 0 rgba(255,255,255,.9);
 }
-#app-navigation .active { /* active navigation entry or folder */
+#app-navigation .active,
+#app-navigation .active a { /* active navigation entry or folder */
 	background-color: #ddd;
 	text-shadow: 0 1px 0 rgba(255,255,255,.7);
 }
diff --git a/core/img/actions/add.svg b/core/img/actions/add.svg
index 29994747c33fb88ccca93363279cce068121d232..136d6c4b3118fbab65b3a38d21730db713005958 100644
--- a/core/img/actions/add.svg
+++ b/core/img/actions/add.svg
@@ -1,109 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg2406"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="add.svg">
-  <metadata
-     id="metadata3125">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview3123"
-     showgrid="false"
-     inkscape:zoom="10.727273"
-     inkscape:cx="11.843286"
-     inkscape:cy="14.728814"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2406" />
-  <defs
-     id="defs2408">
-    <linearGradient
-       id="linearGradient2264">
-      <stop
-         id="stop2266"
-         style="stop-color:#d7e866;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2268"
-         style="stop-color:#8cab2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.103895"
-       y1="15.180944"
-       x2="24.103895"
-       y2="34.224861"
-       id="linearGradient2401"
-       xlink:href="#linearGradient2264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8988874,0,0,0.8934652,-10.463705,-9.5659718)" />
-    <linearGradient
-       id="linearGradient4222">
-      <stop
-         id="stop4224"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4226"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.138529"
-       y1="6.5316639"
-       x2="24.138529"
-       y2="45.690399"
-       id="linearGradient2398"
-       xlink:href="#linearGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.8489228,-1.5061978)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient3128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5399382,0,0,0.5366811,-1.7557025,-1.7858588)"
-       x1="24.138529"
-       y1="6.5316639"
-       x2="24.138529"
-       y2="45.690399" />
-  </defs>
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3128);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-     id="path2272"
-     d="m 8.5932204,8.2151575 0,-5.9948184 4.9999996,0 0,5.9948184 6,0 0,5.0051815 -6,0 0,6 -4.9999996,0 0,-6 -6,0 0,-5.0051815 6,0 z" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="45.69" gradientUnits="userSpaceOnUse" x2="24.139" gradientTransform="matrix(.53994 0 0 .53668 -1.7557 -1.7859)" y1="6.5317" x1="24.139">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+  </linearGradient>
+ </defs>
+ <path opacity=".4" d="m8.5932 8.2152v-5.9948h5v5.9948h6v5.0052h-6v6h-5v-6h-6v-5.0052h6z" fill-rule="evenodd" stroke="url(#a)"/>
 </svg>
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
index ce7e1e6980298b86b6eb5bbf9008ea7dfb67699f..8ac5fbbd1988c713a92c47041b21b948496c9bc3 100644
Binary files a/core/img/actions/caret-dark.png and b/core/img/actions/caret-dark.png differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
index abb1dc192d228813753b156c4e370059a3408767..be45ad402bf4276409ee0c0194fad55d9ff55cf5 100644
--- a/core/img/actions/caret-dark.svg
+++ b/core/img/actions/caret-dark.svg
@@ -1,102 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="10"
-   height="10"
-   id="svg2403"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="caret.svg"
-   inkscape:export-filename="caret.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     id="namedview3047"
-     showgrid="false"
-     inkscape:zoom="25.279067"
-     inkscape:cx="-3.063006"
-     inkscape:cy="6.0978375"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2403"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2405">
-    <linearGradient
-       x1="11.644068"
-       y1="2.4988678"
-       x2="11.644068"
-       y2="15.00281"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0000001,1.1920928e-8)" />
-    <linearGradient
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         id="stop3680"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3682"
-         style="stop-color:#e6e6e6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
-     id="path3768"
-     d="M 1,2 5,10 9,2.011 z"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-  <path
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     d="M 1,1 5,9 9,1.011 z"
-     id="path3716"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z" fill="#fff"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="#999"/>
 </svg>
diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png
index e0ae969a943bb4932af1f95dfd1edace7c71093f..00baea9ece604554243a01bed58fbc48369dd584 100644
Binary files a/core/img/actions/caret.png and b/core/img/actions/caret.png differ
diff --git a/core/img/actions/caret.svg b/core/img/actions/caret.svg
index 7bb0c59cde23ba8b3695214426820f101bdedbce..d1ae8d60a6fe1ab641a8bbe62aa7ec552f90df57 100644
--- a/core/img/actions/caret.svg
+++ b/core/img/actions/caret.svg
@@ -1,112 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="10"
-   height="10"
-   id="svg2403"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="logout.svg"
-   inkscape:export-filename="caret.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="800"
-     id="namedview3047"
-     showgrid="false"
-     inkscape:zoom="25.279067"
-     inkscape:cx="3.6223673"
-     inkscape:cy="6.0978375"
-     inkscape:window-x="0"
-     inkscape:window-y="-31"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2403"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2405">
-    <linearGradient
-       x1="11.644068"
-       y1="2.4988678"
-       x2="11.644068"
-       y2="15.00281"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0000001,1.1920928e-8)" />
-    <linearGradient
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.5789474,0.06024281)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         id="stop3680"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3682"
-         style="stop-color:#e6e6e6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient2993"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,-3.4210526,1.060243)"
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209" />
-  </defs>
-  <path
-     sodipodi:nodetypes="cccc"
-     inkscape:connector-curvature="0"
-     id="path3023"
-     d="M 1,2 5,10 9,2.011 z"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-  <path
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient2993);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     d="M 1,1 5,9 9,1.011 z"
-     id="path3716"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="8.0832" gradientUnits="userSpaceOnUse" x2="8.4965" gradientTransform="matrix(1.0526 0 0 .98436 -3.4211 1.0602)" y1="-.061574" x1="8.4965">
+   <stop stop-color="#fff" offset="0"/>
+   <stop stop-color="#e6e6e6" offset="1"/>
+  </linearGradient>
+ </defs>
+ <path opacity=".5" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="url(#a)"/>
 </svg>
diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png
index 671b3f4f0c1daf8bbea5eb8c8881b07e79ec3b4c..9c3a284b8baa392ffcaefb8ddc4e6d0a124aa990 100644
Binary files a/core/img/actions/clock.png and b/core/img/actions/clock.png differ
diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg
old mode 100755
new mode 100644
index 1821f474df50d8a88b205060e93fb0426f8952a3..f3fcb19031a99818d1dfd2df424ea8e420137264
--- a/core/img/actions/clock.svg
+++ b/core/img/actions/clock.svg
@@ -1,20 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
-<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419  C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505  s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
-<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456  c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146  l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
-<circle cx="49.999" cy="12.956" r="1.617"/>
-<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823  C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
-<circle cx="34.343" cy="20.301" r="1.47"/>
-<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538  c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
-<circle cx="15.536" cy="47.42" r="1.618"/>
-<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822  C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
-<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008  c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
-<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005  c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
-<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618  C49.104,83.498,48.385,82.775,48.382,81.884z"/>
-<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823  c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414  c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
-<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537  c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
-<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537  c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
-<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618  c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
-<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287  c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006  c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414  c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
-<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008  c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
-<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008  c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 100 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="m50 89.836c-23.389 0-42.418-19.027-42.418-42.417s19.029-42.419 42.418-42.419 42.418 19.029 42.418 42.419-19.029 42.417-42.418 42.417zm0-79.924c-20.681 0-37.506 16.826-37.506 37.508 0 20.681 16.826 37.505 37.506 37.505s37.507-16.824 37.507-37.505c0-20.683-16.826-37.508-37.507-37.508z"/>
+<path d="m50.001 49.875c-0.141 0-0.283-0.011-0.427-0.037-1.173-0.206-2.03-1.226-2.03-2.419v-17.977c0-1.355 1.1-2.456 2.456-2.456 1.355 0 2.456 1.1 2.456 2.456v4.003l5.431-14.974c0.464-1.274 1.872-1.937 3.146-1.471 1.274 0.462 1.934 1.871 1.471 3.146l-10.195 28.11c-0.357 0.985-1.29 1.619-2.308 1.619z"/>
+<circle cy="12.956" cx="49.999" r="1.617"/>
+<path d="m50 14.778c-1.006 0-1.823-0.817-1.823-1.823 0-1.005 0.817-1.823 1.823-1.823 1.004 0 1.821 0.817 1.821 1.823s-0.817 1.823-1.821 1.823zm0-3.236c-0.779 0-1.414 0.635-1.414 1.413 0 0.779 0.635 1.414 1.414 1.414s1.412-0.635 1.412-1.414c0-0.778-0.633-1.413-1.412-1.413z"/>
+<circle cy="20.301" cx="34.343" r="1.47"/>
+<path d="m23.617 30.488c0.703 0.409 0.945 1.305 0.537 2.008-0.405 0.704-1.305 0.947-2.007 0.538-0.703-0.403-0.945-1.305-0.539-2.008 0.408-0.701 1.305-0.941 2.009-0.538z"/>
+<circle cy="47.42" cx="15.536" r="1.618"/>
+<path d="m15.536 49.242c-1.006 0-1.823-0.817-1.823-1.823 0.001-1 0.819-1.819 1.823-1.822 1.006 0 1.823 0.817 1.823 1.822 0 1.006-0.817 1.823-1.823 1.823zm0-3.236c-0.777 0.003-1.412 0.636-1.414 1.413 0 0.779 0.635 1.414 1.414 1.414s1.413-0.635 1.413-1.414c0-0.778-0.634-1.413-1.413-1.413z"/>
+<path d="m22.147 61.803c0.705-0.406 1.602-0.167 2.007 0.537 0.408 0.703 0.166 1.602-0.537 2.008-0.704 0.406-1.604 0.163-2.008-0.537-0.407-0.707-0.162-1.602 0.538-2.008z"/>
+<path d="m33.07 73.803c0.408-0.706 1.305-0.946 2.008-0.537 0.704 0.403 0.945 1.302 0.538 2.005-0.405 0.704-1.307 0.947-2.007 0.537-0.705-0.406-0.942-1.301-0.539-2.005z"/>
+<path d="m48.382 81.884c0-0.896 0.725-1.618 1.618-1.618 0.892-0.003 1.618 0.723 1.618 1.618 0 0.892-0.728 1.618-1.618 1.618-0.896-0.004-1.615-0.727-1.618-1.618z"/>
+<path d="m50 83.706c-1.002-0.003-1.819-0.82-1.823-1.822 0-1.006 0.817-1.823 1.823-1.823 1.007 0 1.822 0.817 1.822 1.823 0 1.005-0.816 1.822-1.822 1.822zm0.006-3.236c-0.785 0-1.42 0.635-1.42 1.414 0.003 0.775 0.637 1.41 1.414 1.413 0.78 0 1.413-0.635 1.413-1.413 0-0.78-0.631-1.414-1.407-1.414z"/>
+<path d="m64.385 75.271c-0.408-0.703-0.167-1.602 0.537-2.005 0.702-0.409 1.601-0.169 2.008 0.537 0.406 0.7 0.163 1.603-0.539 2.005-0.705 0.406-1.6 0.163-2.006-0.537z"/>
+<path d="m76.384 64.348c-0.704-0.406-0.945-1.305-0.537-2.008 0.402-0.704 1.301-0.943 2.006-0.537 0.704 0.402 0.945 1.308 0.539 2.008-0.412 0.7-1.305 0.94-2.008 0.537z"/>
+<path d="m84.464 49.038c-0.896-0.003-1.618-0.726-1.618-1.618-0.001-0.892 0.723-1.618 1.618-1.618 0.893-0.003 1.618 0.726 1.618 1.618-0.005 0.895-0.726 1.614-1.618 1.618z"/>
+<path d="m84.464 49.242c-1.006-0.003-1.822-0.822-1.822-1.823-0.002-0.486 0.188-0.943 0.532-1.287 0.344-0.345 0.803-0.535 1.29-0.535 1.007 0 1.822 0.817 1.822 1.822-0.004 1.003-0.823 1.82-1.822 1.823zm0.007-3.236c-0.386 0-0.74 0.147-1.008 0.416-0.267 0.267-0.412 0.621-0.412 0.998 0 0.777 0.635 1.41 1.413 1.414 0.775-0.003 1.408-0.638 1.413-1.415 0-0.778-0.631-1.413-1.406-1.413z"/>
+<path d="m77.853 33.034c-0.705 0.409-1.604 0.166-2.006-0.538-0.408-0.7-0.168-1.599 0.537-2.008 0.701-0.406 1.604-0.163 2.008 0.537 0.403 0.707 0.161 1.602-0.539 2.009z"/>
+<path d="m66.93 21.036c-0.407 0.704-1.308 0.943-2.008 0.537-0.704-0.403-0.945-1.305-0.537-2.008 0.404-0.703 1.306-0.943 2.006-0.537 0.704 0.409 0.942 1.305 0.539 2.008z"/>
+</svg>
diff --git a/core/img/actions/close.png b/core/img/actions/close.png
index bc0c782882deaa4f9ecf1676592ddba0cc9aacbc..0d8c89a56e2d88463f52bb1901ccf228640ff7a1 100644
Binary files a/core/img/actions/close.png and b/core/img/actions/close.png differ
diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
index 6a6d98e34ad84113dedfa7b5984ffaa8128622d9..ef564bfd482292f589ad750827209a6b1580fd99 100644
--- a/core/img/actions/close.svg
+++ b/core/img/actions/close.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close.svg"
-   inkscape:export-filename="close.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.67268"
-     inkscape:cx="11.940651"
-     inkscape:cy="15.685139"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 3,1040.3622 1,-1 4,3 4,-3 1,1 -3,4 3,4 -1,1 -4,-3 -4,3 -1,-1 3,-4 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
index 08b15510d926eaddb2c59558120a8d0166c58486..048d91cee5143ce826ef9ef3d7619d835bce0877 100644
Binary files a/core/img/actions/delete-hover.png and b/core/img/actions/delete-hover.png differ
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
index 63cacd5e38e584b0afaee2265b273ab3a8063755..3e8d26c9786d16addcd5df03219d712356c1e09b 100644
--- a/core/img/actions/delete-hover.svg
+++ b/core/img/actions/delete-hover.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="delete.svg"
-   inkscape:export-filename="delete-hover.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.67268"
-     inkscape:cx="11.940651"
-     inkscape:cy="15.685139"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#d40000;fill-opacity:1;stroke:none"
-       d="m 3,1040.3622 1,-1 4,3 4,-3 1,1 -3,4 3,4 -1,1 -4,-3 -4,3 -1,-1 3,-4 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z" fill="#d40000"/>
+ </g>
 </svg>
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index 86c8317d01da333608489b0b8ee708d524cd3747..ef564bfd482292f589ad750827209a6b1580fd99 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,70 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="delete.svg">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.345359"
-     inkscape:cx="1.5609441"
-     inkscape:cy="8.3505321"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 3,1040.3622 1,-1 4,3 4,-3 1,1 -3,4 3,4 -1,1 -4,-3 -4,3 -1,-1 3,-4 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m3 1040.4 1-1 4 3 4-3 1 1-3 4 3 4-1 1-4-3-4 3-1-1 3-4z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/download.svg b/core/img/actions/download.svg
index 107a46f07bf454ba25915bb6179dec0a966f6797..a469c3b8a00e9620fc5439830ea581a425281efb 100644
--- a/core/img/actions/download.svg
+++ b/core/img/actions/download.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="download.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 6,1037.3622 4,0 1,7 4,0 -7,7 -7,-7 4,0 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m6 1037.4h4l1 7h4l-7 7-7-7h4z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/history.png b/core/img/actions/history.png
index 1d138b8cd5a9e77806a4395bcc78e68eb2b68d7d..3234880b25ab2efa68f9ef244876eb37d17673de 100644
Binary files a/core/img/actions/history.png and b/core/img/actions/history.png differ
diff --git a/core/img/actions/history.svg b/core/img/actions/history.svg
index 9c2838d565b6a93f399581c3ff3272a5b6747649..94512a2d431deae94f7607fa29c8b5499f9955b7 100644
--- a/core/img/actions/history.svg
+++ b/core/img/actions/history.svg
@@ -1,240 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="17"
-   height="17"
-   id="svg3972"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="backup.svg"
-   inkscape:export-filename="/home/ronny/persoenliches/Programme/JBackpack/jbackpack/src/ch/fhnw/jbackpack/icons/16x16/icon.png"
-   inkscape:export-xdpi="2.8099999"
-   inkscape:export-ydpi="2.8099999">
-  <defs
-     id="defs3974">
-    <linearGradient
-       id="linearGradient3820">
-      <stop
-         style="stop-color:#7399ab;stop-opacity:1;"
-         offset="0"
-         id="stop3822" />
-      <stop
-         style="stop-color:#fffeff;stop-opacity:1;"
-         offset="1"
-         id="stop3824" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5144">
-      <stop
-         style="stop-color:#ab7392;stop-opacity:1;"
-         offset="0"
-         id="stop5146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.02909091"
-         offset="1"
-         id="stop5148" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5130">
-      <stop
-         id="stop5140"
-         offset="0"
-         style="stop-color:#a08f82;stop-opacity:0.74901961;" />
-      <stop
-         id="stop5138"
-         offset="0.5"
-         style="stop-color:#ab7392;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#ab7392;stop-opacity:0;"
-         offset="1"
-         id="stop5134" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4519"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#5d879d;stop-opacity:1;"
-         offset="0"
-         id="stop4521" />
-      <stop
-         style="stop-color:#5d879d;stop-opacity:0;"
-         offset="1"
-         id="stop4523" />
-    </linearGradient>
-    <filter
-       id="filter4697"
-       inkscape:label="Drop shadow"
-       width="1.5"
-       height="1.5"
-       x="-0.25"
-       y="-0.25"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur4699"
-         in="SourceAlpha"
-         stdDeviation="2"
-         result="blur" />
-      <feColorMatrix
-         id="feColorMatrix4701"
-         result="bluralpha"
-         type="matrix"
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0 " />
-      <feOffset
-         id="feOffset4703"
-         in="bluralpha"
-         dx="4"
-         dy="4"
-         result="offsetBlur" />
-      <feMerge
-         id="feMerge4705">
-        <feMergeNode
-           id="feMergeNode4707"
-           in="offsetBlur" />
-        <feMergeNode
-           id="feMergeNode4709"
-           in="SourceGraphic" />
-      </feMerge>
-    </filter>
-    <filter
-       id="filter5086"
-       inkscape:label="Drop shadow"
-       width="1.5"
-       height="1.5"
-       x="-0.25"
-       y="-0.25"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur5088"
-         in="SourceAlpha"
-         stdDeviation="5"
-         result="blur" />
-      <feColorMatrix
-         id="feColorMatrix5090"
-         result="bluralpha"
-         type="matrix"
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.5 0 " />
-      <feOffset
-         id="feOffset5092"
-         in="bluralpha"
-         dx="10"
-         dy="10"
-         result="offsetBlur" />
-      <feMerge
-         id="feMerge5094">
-        <feMergeNode
-           id="feMergeNode5096"
-           in="offsetBlur" />
-        <feMergeNode
-           id="feMergeNode5098"
-           in="SourceGraphic" />
-      </feMerge>
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5130"
-       id="linearGradient5136"
-       x1="119.76609"
-       y1="431.36642"
-       x2="631.76611"
-       y2="431.36642"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5144"
-       id="radialGradient5150"
-       cx="294.02567"
-       cy="300.53604"
-       fx="294.02567"
-       fy="300.53604"
-       r="183.84033"
-       gradientTransform="matrix(0.66691196,0.43225768,-0.44145763,0.68110633,230.61036,-24.143353)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4381"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.5"
-         id="feGaussianBlur4383" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3820"
-       id="linearGradient3575"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.06875313,0,0,0.06875313,2.829762,444.82336)"
-       x1="339.43503"
-       y1="370.08636"
-       x2="66.978798"
-       y2="135.09288" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="12.081283"
-     inkscape:cy="8.5032287"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1033"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4447"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3977">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(93.42207,-466.65551)">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m -83.896989,468.73997 c -3.950245,0 -6.534942,3.44694 -6.364259,6.72133 l -2.160822,0 3.904021,3.91738 4.081269,-3.87222 -2.148938,0 c -0.237051,-1.70092 1.163456,-3.1145 2.688727,-3.0921 1.596496,0.0235 2.800571,1.22922 2.800571,2.73336 0.08961,1.59378 -1.629405,3.4279 -3.965431,2.53172 -8.3e-5,1.22806 0.0027,2.54389 0,3.76397 4.189434,0.82896 7.639781,-2.50953 7.639781,-6.25087 0,-3.56212 -2.9188,-6.45252 -6.474921,-6.45252 z"
-       id="path4438"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccscccccc"
-       inkscape:export-filename="/home/samtuke/owncloud/git/owncloud/core/img/actions/history.png"
-       inkscape:export-xdpi="89.929733"
-       inkscape:export-ydpi="89.929733" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" height="17" width="17" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(93.422 -466.66)">
+  <path d="m-83.897 468.74c-3.9502 0-6.5349 3.4469-6.3643 6.7213h-2.1608l3.904 3.9174 4.0813-3.8722h-2.1489c-0.23705-1.7009 1.1635-3.1145 2.6887-3.0921 1.5965 0.0235 2.8006 1.2292 2.8006 2.7334 0.08961 1.5938-1.6294 3.4279-3.9654 2.5317-0.000083 1.2281 0.0027 2.5439 0 3.764 4.1894 0.82896 7.6398-2.5095 7.6398-6.2509 0-3.5621-2.9188-6.4525-6.4749-6.4525z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/info.svg b/core/img/actions/info.svg
index 1e07aed85271c6ae91ce3fa360127ff1e0404f23..55bdb17f2e1f6764613922bc1427e70dab1e639e 100644
--- a/core/img/actions/info.svg
+++ b/core/img/actions/info.svg
@@ -1,1758 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="users.svg"
-   inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/users.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="14.025105"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="20.074369"
-       x2="14.152531"
-       y1="-1.4095211"
-       x1="14.501121"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3437"
-       xlink:href="#linearGradient3587-6-5-19"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="28.776533"
-       x2="0.44923753"
-       y1="13.895414"
-       x1="0.86849999"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3456"
-       xlink:href="#linearGradient3587-6-5-4"
-       inkscape:collect="always" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <g
-       id="g4314"
-       transform="matrix(1.0000288,0,0,1,-0.14973031,7.5119235e-7)">
-      <path
-         d="M 5.149582,8.4745445 C 5.3049331,8.8555559 5.4749951,9.1626038 5.7940692,8.7203676 6.2006678,8.4518873 7.5528003,7.2925123 7.4556978,8.3783304 7.0875579,10.395217 6.6215241,12.395026 6.2845924,14.416813 5.892954,15.532242 6.9195772,16.485144 7.9224991,15.729405 9.0003636,15.226276 9.9139828,14.440939 10.850418,13.716521 10.706075,13.39458 10.599944,12.928009 10.253582,13.370754 9.7853152,13.60987 8.7844663,14.688222 8.5572925,13.841548 8.8726653,11.661003 9.5328233,9.5467073 9.9227187,7.3804227 10.320459,6.3755023 9.5582449,5.1570833 8.5229975,6.0170334 7.266481,6.6343485 6.2334577,7.6013759 5.149582,8.4745445 z M 9.6088759,1.0026758 C 8.3013694,0.98534052 7.7033019,3.148247 8.9661979,3.6822119 9.9886006,4.0601787 11.042606,2.968368 10.755649,1.9317924 10.657925,1.3899396 10.158361,0.96201137 9.6088769,1.0026758 l -1e-6,0 z"
-         id="path3536-8"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
-         inkscape:connector-curvature="0" />
-      <path
-         d="M 5.149582,7.4745451 C 5.3049334,7.8555565 5.4749951,8.1626045 5.7940689,7.7203682 6.2006672,7.4518879 7.5527994,6.292513 7.4556976,7.378331 7.0875583,9.3952173 6.6215238,11.395026 6.2845927,13.416813 5.8929541,14.532242 6.9195769,15.485145 7.9224987,14.729405 9.0003636,14.226276 9.9139826,13.440939 10.850418,12.716521 10.706076,12.394581 10.599945,11.928009 10.253583,12.370754 9.7853157,12.60987 8.784467,13.688222 8.5572925,12.841549 8.872666,10.661003 9.5328233,8.5467079 9.9227188,6.3804233 10.32046,5.3755029 9.5582457,4.1570839 8.5229973,5.017034 7.2664804,5.6343492 6.2334583,6.6013765 5.149582,7.4745451 z M 9.6088764,0.00267653 C 8.3013697,-0.01465929 7.7033021,2.1482476 8.9661977,2.6822125 9.9886009,3.0601794 11.042605,1.9683686 10.755649,0.93179313 10.657922,0.38994033 10.158361,-0.03798791 9.6088774,0.00267653 l -1e-6,0 z"
-         id="path3536"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;opacity:0.7;fill:url(#linearGradient3456);fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="28.777" gradientUnits="userSpaceOnUse" y1="13.895" gradientTransform="matrix(1.0345 0 0 1.0345 8.0708 -14.514)" x2=".44924" x1=".86850">
+   <stop offset="0"/>
+   <stop stop-color="#363636" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g transform="translate(-.14973 7.5119e-7)">
+  <path opacity=".6" d="m5.1496 8.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0167-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.01736-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.5419-0.598-0.96979-1.1471-0.9291h-0.000001z" fill="#fff"/>
+  <path opacity=".7" d="m5.1496 7.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0169-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.54186-0.598-0.96979-1.1471-0.92912h-0.000001z" fill="url(#a)"/>
+ </g>
 </svg>
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
index 511bfa615bb4b28755140658d0f868cb3fe411ec..dbcffa3990f7dace24aaae6836977a142d57fe47 100644
Binary files a/core/img/actions/lock.png and b/core/img/actions/lock.png differ
diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg
old mode 100755
new mode 100644
index 8fb039b9e3bfda809ed00b3b36e755291315641f..beef1d3ad3a2dca0945948e87ca4e969e1e04707
--- a/core/img/actions/lock.svg
+++ b/core/img/actions/lock.svg
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 71 100" xml:space="preserve">
-<path d="M65.5,45V30c0-16.542-13.458-30-30-30s-30,13.458-30,30v15H0v55h71V45H65.5z M13.5,30c0-12.131,9.869-22,22-22
-	s22,9.869,22,22v15h-44V30z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 71 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="m65.5 45v-15c0-16.542-13.458-30-30-30s-30 13.458-30 30v15h-5.5v55h71v-55h-5.5zm-52-15c0-12.131 9.869-22 22-22s22 9.869 22 22v15h-44v-15z"/>
+</svg>
diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png
index e2f4b7af12ef73d2b72006d461bbd731f7cf0410..e9c89a15a7a396afe0e597fd8934709ca970ce7d 100644
Binary files a/core/img/actions/logout.png and b/core/img/actions/logout.png differ
diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg
index e5edc24895d051daf3a5e7da66d385384f3092e1..59543875d750916c75e17a76afe187ed7221ae96 100644
--- a/core/img/actions/logout.svg
+++ b/core/img/actions/logout.svg
@@ -1,178 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg2403"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="logout.svg"
-   inkscape:export-filename="logout.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview3047"
-     showgrid="false"
-     inkscape:zoom="25.279067"
-     inkscape:cx="-1.6512429"
-     inkscape:cy="6.4537904"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2403" />
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2405">
-    <linearGradient
-       x1="11.644068"
-       y1="2.4988678"
-       x2="11.644068"
-       y2="15.00281"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0000001,1.1920928e-8)" />
-    <linearGradient
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         id="stop3680"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3682"
-         style="stop-color:#e6e6e6;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3879"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3908"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0000001,1.1920928e-8)"
-       x1="11.644068"
-       y1="2.4988678"
-       x2="11.644068"
-       y2="15.00281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3914"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3916"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0000001,1.1920928e-8)"
-       x1="11.644068"
-       y1="2.4988678"
-       x2="11.644068"
-       y2="15.00281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3919"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0000001,1.1920928e-8)"
-       x1="11.644068"
-       y1="2.4988678"
-       x2="11.644068"
-       y2="15.00281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="8.083209" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3925"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,0.578947,0.06024281)"
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="15.216674" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3942"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0526316,0,0,0.9843625,-0.42098964,0.06024281)"
-       x1="8.4964771"
-       y1="-0.061573759"
-       x2="8.4964771"
-       y2="15.216674" />
-  </defs>
-  <path
-     sodipodi:nodetypes="sccsccsccssscscssscscc"
-     inkscape:connector-curvature="0"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     d="m 8.0000634,0 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,12.733393 4.5611725,15 7.9688134,15 11.327833,15 13.846204,12.850562 14.687563,10.21875 15.528922,7.5869378 14.630363,4.3955638 11.562563,2.625 11.128957,2.3713639 10.503661,2.535122 10.250038,2.9687356 9.9964154,3.4023491 10.160192,4.0276401 10.593813,4.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,7.5564313 3.0469519,5.451888 5.2813134,4.28125 5.6599659,4.0748887 5.8603711,3.5887067 5.7371222,3.1754605 5.6138734,2.7622144 5.1798937,2.4652349 4.7500634,2.5 4.7188384,2.49846 4.6875384,2.49846 4.6563134,2.5 z"
-     id="path3781" />
-  <path
-     id="path3927"
-     d="m 8.0000634,1 c -0.4714045,0 -0.9610304,0.5419023 -0.95,1 l 0,6 c -0.00747,0.5283126 0.4216346,1 0.95,1 0.5283654,0 0.957472,-0.4716874 0.95,-1 l 0,-6 c 0.014622,-0.605105 -0.4785955,-1 -0.95,-1 z m -3.34375,2.5 c -0.087186,0.019294 -0.1716251,0.050959 -0.25,0.09375 -2.9994999,1.5715133 -3.91842874,4.7978566 -3.125,7.46875 C 2.0747421,13.733393 4.5611725,16 7.9688134,16 11.327833,16 13.846204,13.850562 14.687563,11.21875 15.528922,8.5869378 14.630363,5.3955638 11.562563,3.625 11.128957,3.3713639 10.503661,3.535122 10.250038,3.9687356 9.9964154,4.4023491 10.160192,5.0276401 10.593813,5.28125 c 2.390793,1.3798311 2.882452,3.4944109 2.28125,5.375 -0.601202,1.880589 -2.344037,3.4375 -4.9062496,3.4375 -2.575923,0 -4.297634,-1.650181 -4.875,-3.59375 C 2.5164474,8.5564313 3.0469519,6.451888 5.2813134,5.28125 5.6599659,5.0748887 5.8603711,4.5887067 5.7371222,4.1754605 5.6138734,3.7622144 5.1798937,3.4652349 4.7500634,3.5 4.7188384,3.49846 4.6875384,3.49846 4.6563134,3.5 z"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sccsccsccssscscssscscc" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0001 0c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9435-0.047-4.048 2.1873-5.2187 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0001 1c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9436-0.047-4.0481 2.1873-5.2188 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/mail.svg b/core/img/actions/mail.svg
index e82fa3b4677c9b1a8cdc49e2458bf20a44d55311..2c63daac03440c9003f7ac8fc7b5b60ff46e826c 100644
--- a/core/img/actions/mail.svg
+++ b/core/img/actions/mail.svg
@@ -1,58 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg2985">
-  <defs
-     id="defs2987">
-    <linearGradient
-       id="linearGradient3767">
-      <stop
-         id="stop3769"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3771"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata2990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1">
-    <rect
-       width="15.243872"
-       height="10.243872"
-       x="0.37806413"
-       y="2.6280646"
-       id="rect2995"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75612825;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <path
-       d="M -0.6,11 8,6 l 8.6,5"
-       id="path3765"
-       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 0,2.5 8,9 16,2.5"
-       id="path3775"
-       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g>
+  <rect stroke-linejoin="round" height="10.244" width="15.244" stroke="#000" stroke-linecap="square" y="2.6281" x=".37806" stroke-width=".75613"/>
+  <path d="m-0.6 11 8.6-5l8.6 5" stroke="#fff" stroke-width="1px" fill="none"/>
+  <path d="m0 2.5 8 6.5 8-6.5" stroke="#fff" stroke-linecap="round" stroke-width="1px"/>
+ </g>
 </svg>
diff --git a/core/img/actions/password.png b/core/img/actions/password.png
index 5167161dfa9906bb6e822dd849bc94328800feee..edcafdd9bbfb7b6c11f12e9b93f2be87ad1e282c 100644
Binary files a/core/img/actions/password.png and b/core/img/actions/password.png differ
diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg
index ee6a9fe01829da4c559d93d4cd9d6b2499a16fcb..9ab5d4243d92e0c38040b957de7957f686973c88 100644
--- a/core/img/actions/password.svg
+++ b/core/img/actions/password.svg
@@ -1,2148 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="password.svg"
-   inkscape:export-filename="password.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="16.000001"
-     inkscape:cx="-1.1375545"
-     inkscape:cy="5.0070539"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4566-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       id="linearGradient3587-6-5-26">
-      <stop
-         id="stop3589-9-2-45"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-20"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       id="linearGradient4580-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-2-1">
-      <stop
-         id="stop3589-9-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="1013.451"
-       x2="209.34245"
-       y1="998.45801"
-       x1="209.34245"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3528"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       id="linearGradient3335-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-4">
-      <stop
-         id="stop3589-9-2-8-7-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-6"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3567"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5021-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-3">
-      <stop
-         id="stop3589-9-2-67-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5018-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3584">
-      <stop
-         id="stop3586"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3588"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5015-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3591">
-      <stop
-         id="stop3593"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3595"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5012-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3598">
-      <stop
-         id="stop3600"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3602"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4638"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4640"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4644"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4663"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4665"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-3-9">
-      <stop
-         id="stop3589-9-2-67-4-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-9-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       id="linearGradient4661-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4682">
-      <stop
-         id="stop4684"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4686"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4689">
-      <stop
-         id="stop4691"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4693"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       id="linearGradient4665-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4696">
-      <stop
-         id="stop4698"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4700"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="19.490837"
-       x2="26.045763"
-       y1="9.6223383"
-       x1="26.045763"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4707"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient3717"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient3719"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient3721"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient3723"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;opacity:1"
-       d="M 3 6 C 1.8954305 6 1 6.8954305 1 8 C 1 9.1045695 1.8954305 10 3 10 C 4.1045695 10 5 9.1045695 5 8 C 5 6.8954305 4.1045695 6 3 6 z M 8 6 C 6.8954305 6 6 6.8954305 6 8 C 6 9.1045695 6.8954305 10 8 10 C 9.1045695 10 10 9.1045695 10 8 C 10 6.8954305 9.1045695 6 8 6 z M 13 6 C 11.895431 6 11 6.8954305 11 8 C 11 9.1045695 11.895431 10 13 10 C 14.104569 10 15 9.1045695 15 8 C 15 6.8954305 14.104569 6 13 6 z "
-       id="path3750" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path d="m3 6c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.1046 0-2 0.8954-2 2s0.8954 2 2 2 2-0.8954 2-2-0.8954-2-2-2zm5 0c-1.105 0-2 0.8954-2 2s0.895 2 2 2 2-0.8954 2-2-0.895-2-2-2z" fill-rule="evenodd"/>
 </svg>
diff --git a/core/img/actions/pause-big.svg b/core/img/actions/pause-big.svg
index b521057a35cef9f29c055f380f5915ab861e287f..9c4944223ff54408fe6f80e4895fce6010ac1e9c 100644
--- a/core/img/actions/pause-big.svg
+++ b/core/img/actions/pause-big.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play-big.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.2402344"
-     inkscape:cx="110.24162"
-     inkscape:cy="54.102269"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 1,1037.3622 0,14 5,0 0,-14 z m 9,0 0,14 5,0 0,-14 z"
-       id="path3086-7"
-       sodipodi:nodetypes="cccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m1 1037.4v14h5v-14zm9 0v14h5v-14z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/pause.svg b/core/img/actions/pause.svg
index ff3c69d6c71c704ea758e3aea58329118c224a3a..d572ad6f5c5a52daa8ffca7deb71dc45ab8c7f8b 100644
--- a/core/img/actions/pause.svg
+++ b/core/img/actions/pause.svg
@@ -1,72 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play-next.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-big.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="M 3 3 L 3 13 L 7 13 L 7 3 L 3 3 z M 9 3 L 9 13 L 13 13 L 13 3 L 9 3 z "
-       transform="translate(0,1036.3622)"
-       id="path3086" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m3 3v10h4v-10h-4zm6 0v10h4v-10h-4z" transform="translate(0 1036.4)"/>
+ </g>
 </svg>
diff --git a/core/img/actions/play-add.svg b/core/img/actions/play-add.svg
index 25ff0b57eee76312ddfe1547b0af797157d518b9..cdf4f6ea9f3bbba59f4698e6a4102d1cef05812f 100644
--- a/core/img/actions/play-add.svg
+++ b/core/img/actions/play-add.svg
@@ -1,83 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play-add.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.345359"
-     inkscape:cx="2.4224415"
-     inkscape:cy="8.0693339"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <g
-       id="g4806"
-       style="fill:#000000;fill-opacity:1">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3086"
-         d="m 2,1037.3622 11,6 -11,6 z"
-         style="fill:#000000;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccccccc"
-         id="rect2984"
-         d="m 11,1045.3622 0,2 -2,0 0,2 2,0 0,2 2,0 0,-2 2,0 0,-2 -2,0 0,-2 z"
-         style="fill:#000000;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" />
-    </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <g>
+   <path d="m2 1037.4 11 6-11 6z"/>
+   <path d="m11 1045.4v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/>
   </g>
+ </g>
 </svg>
diff --git a/core/img/actions/play-big.svg b/core/img/actions/play-big.svg
index 2ef67415323bd115ce2d60993e160bfc4ce059bf..884171ced853f8c9c252f9bcbb51e8dc3852aacf 100644
--- a/core/img/actions/play-big.svg
+++ b/core/img/actions/play-big.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 0,1036.3622 16,8 -16,8 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m0 1036.4 16 8-16 8z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/play-next.svg b/core/img/actions/play-next.svg
index 9a41e4bd9d088db119c0e0930646f167361b37b1..8b3d7d6effcba0a27e02d77642e7835d63353fed 100644
--- a/core/img/actions/play-next.svg
+++ b/core/img/actions/play-next.svg
@@ -1,79 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play-big.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-big.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 7,1038.3622 7,6 -7,6 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 2,1038.3622 7,6 -7,6 z"
-       id="path3086-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m7 1038.4 7 6-7 6z"/>
+  <path d="m2 1038.4 7 6-7 6z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/play-previous.svg b/core/img/actions/play-previous.svg
index 31d45dedb4df5cd0792f78416366810d2f2e1938..6210b088cb8fa2bf59f96b6643b5eba75a9c7f85 100644
--- a/core/img/actions/play-previous.svg
+++ b/core/img/actions/play-previous.svg
@@ -1,79 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="next.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-next.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 9,1038.3622 -7,6 7,6 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 14,1038.3622 -7,6 7,6 z"
-       id="path3086-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m9 1038.4-7 6 7 6z"/>
+  <path d="m14 1038.4-7 6 7 6z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/play.svg b/core/img/actions/play.svg
index 7bb7b5c262a2d7f1e407250587d521fd5b1ef8ad..ae23e6a0d263d7a14a63ee21fa9937cb7c9b2a61 100644
--- a/core/img/actions/play.svg
+++ b/core/img/actions/play.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 2,1038.3622 12,6 -12,6 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m2 1038.4 12 6-12 6z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/public.svg b/core/img/actions/public.svg
index b47305fbd086f41304f9f75fd64f84d40ccc90e1..c70a76277884125223ec3f902093efb0c41499d6 100644
--- a/core/img/actions/public.svg
+++ b/core/img/actions/public.svg
@@ -1,292 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg2457"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="world.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="17.875"
-     inkscape:cx="-12.837249"
-     inkscape:cy="5.7622378"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2457" />
-  <defs
-     id="defs2459">
-    <linearGradient
-       id="linearGradient5128">
-      <stop
-         id="stop5130"
-         style="stop-color:#e5e5e5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5132"
-         style="stop-color:#ababab;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="86.132919"
-       y1="105.105"
-       x2="84.63858"
-       y2="20.895"
-       id="linearGradient3260"
-       xlink:href="#linearGradient5128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(9.6142312e-2,0,0,9.6142312e-2,1.8468935,1.9430362)" />
-    <linearGradient
-       id="linearGradient3397">
-      <stop
-         id="stop3399"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3401"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21"
-       y1="0"
-       x2="21"
-       y2="16.004715"
-       id="linearGradient3264"
-       xlink:href="#linearGradient3397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105"
-       id="linearGradient3262"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309-5"
-       id="linearGradient3066-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311-3"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313-3"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3920"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678-0"
-       id="linearGradient3920-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       id="linearGradient3678-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680-5" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3784"
-       x1="0.5"
-       y1="7.5560002"
-       x2="15.5"
-       y2="7.5560002"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3810"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3813"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,10.462268,-5.974418)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       x1="7.4930072"
-       y1="0.0035526801"
-       x2="7.4930072"
-       y2="14.998127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3798"
-       x1="8.8461542"
-       y1="0.89504272"
-       x2="8.8461542"
-       y2="15.048951"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7-2"
-       id="linearGradient3798-6"
-       x1="8.8461542"
-       y1="0.89504272"
-       x2="8.8461542"
-       y2="15.048951"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7-2">
-      <stop
-         id="stop3589-9-2-2-6-2-9"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-1,-1)"
-       y2="15.048951"
-       x2="8.8461542"
-       y1="0.89504272"
-       x1="8.8461542"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3815"
-       xlink:href="#linearGradient3587-6-5-3-5-7-2"
-       inkscape:collect="always" />
-  </defs>
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none"
-     d="M 8,1 C 4.1340071,1 1,4.134007 1,7.9999999 1,11.865994 4.1340071,15 8,15 11.865994,15 15,11.865994 15,7.9999999 15,4.134007 11.865994,1 8,1 z m 0.8020833,0.8932295 c 1.2010717,0.026708 2.2624547,0.7482116 3.3359377,1.2213541 L 13.869792,5.511719 13.596354,6.5416669 14.125,6.8697919 14.1159,8.0911458 c -0.0121,0.349374 0.005,0.6992101 -0.0091,1.048177 -0.166346,0.6623539 -0.550627,1.2665712 -0.875,1.8684892 -0.219888,0.108406 0.02005,-0.7185 -0.11849,-0.97526 C 13.14504,9.4386408 12.642422,9.4660089 12.302112,9.7955727 11.881413,10.041226 10.955977,10.114914 10.92581,9.4492183 10.687264,8.6490761 10.891165,7.7966268 11.217384,7.0520835 L 10.679623,6.3958335 10.87103,4.7096354 10.014259,3.8437502 10.21478,2.8958336 9.2121752,2.3307295 C 9.0145444,2.1755339 8.6384357,2.114115 8.5559252,1.902344 8.6372992,1.897654 8.7219474,1.891447 8.8020189,1.893224 z m -2.4609375,0.00912 c 0.031442,0.00459 0.069992,0.026431 0.1276042,0.072917 C 6.8067806,2.1608975 6.3863479,2.3716106 6.2864583,2.5677086 5.7466682,2.9328038 6.4524911,3.2318365 6.6875,3.5247398 7.0642392,3.4164892 7.4410308,2.8779535 7.9908854,3.0416669 8.6942527,2.8222093 8.5821719,3.630807 8.984375,3.9895836 9.036567,4.1585309 9.8643709,4.7080895 9.3671875,4.5273437 8.9577408,4.2098855 8.5022772,4.2337911 8.2096354,4.6914062 7.4187262,5.1199798 7.8867869,3.8662153 7.5078125,3.5611981 6.9348738,2.9219861 7.1750002,4.0387484 7.1067708,4.3723957 6.7342944,4.364267 6.0387231,4.0858224 5.6575521,4.5364583 L 6.03125,5.1471356 6.4778646,4.4635416 C 6.5864179,4.2161129 6.7226128,4.6558348 6.8424479,4.736979 6.9855355,5.0129459 7.6653536,5.4804485 7.1523438,5.6119794 6.3917179,6.0339397 5.7934201,6.6737624 5.1471354,7.2434895 4.9290953,7.7034971 4.4841468,7.6508764 4.2083333,7.2708332 3.5410706,6.8603335 3.5906422,7.9274218 3.625,8.3281249 l 0.5833333,-0.3645833 0,0.6015625 C 4.19179,8.6789089 4.2058787,8.7972867 4.1992147,8.9114582 3.790491,9.3384813 3.3785344,8.3120287 3.0234334,8.0820311 L 2.9960896,6.5781252 C 3.0089957,6.1556005 2.9197821,5.7229754 3.0052082,5.3111981 3.8089547,4.4486619 4.6253679,3.5550749 5.1015624,2.4583336 l 0.7838542,0 C 6.4331575,2.7236662 6.1210544,1.8701843 6.3411457,1.902344 z M 5.1835938,9.722656 c 0.095099,-0.010145 0.2032823,0.011573 0.3190103,0.072921 0.7379441,0.1056226 1.289687,0.640901 1.8776042,1.048178 0.4687224,0.464525 1.4828124,0.315782 1.5950521,1.102865 -0.1706086,0.853749 -1.0104785,1.312191 -1.75,1.61328 C 7.0406658,13.662851 6.8423351,13.744732 6.6328125,13.77865 5.9471995,13.950405 5.6507787,13.2474 5.5117188,12.721359 5.2012551,12.071255 4.4254987,11.578795 4.5364583,10.779953 4.5547311,10.382752 4.7714976,9.7666104 5.1835938,9.7226607 z"
-     id="path3002" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m8 1c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm0.80208 0.89323c1.2011 0.026708 2.2625 0.74821 3.3359 1.2214l1.732 2.3971-0.274 1.03 0.529 0.3281-0.009 1.2213c-0.0121 0.34937 0.005 0.69921-0.0091 1.0482-0.16635 0.66235-0.55063 1.2666-0.875 1.8685-0.21989 0.10841 0.02005-0.7185-0.11849-0.97526 0.032-0.5934-0.471-0.566-0.811-0.2364-0.421 0.2454-1.346 0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526 0.291-2.3971l-0.537-0.6563 0.191-1.6862-0.857-0.8658 0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284 0.0814-0.0046 0.166-0.0109 0.2461-0.0091zm-2.4609 0.00912c0.031442 0.00459 0.069992 0.026431 0.1276 0.072917 0.338 0.1857-0.0825 0.3964-0.1823 0.5925-0.5398 0.3651 0.166 0.6641 0.401 0.957 0.3767-0.1082 0.7535-0.6467 1.3034-0.483 0.7034-0.2195 0.5913 0.5891 0.9935 0.9479 0.0522 0.1689 0.88 0.7185 0.3828 0.5377-0.4095-0.3174-0.8649-0.2935-1.1576 0.1641-0.7909 0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328 0.4775-0.401 0.8112-0.3725-0.0081-1.0681-0.2866-1.4492 0.1641l0.3736 0.6106 0.4467-0.6836c0.1085-0.2474 0.2447 0.1923 0.3645 0.2735 0.1431 0.2759 0.823 0.7434 0.3099 0.875-0.7606 0.4219-1.3589 1.0618-2.0052 1.6315-0.218 0.46-0.663 0.4074-0.9388 0.0273-0.6672-0.4105-0.6177 0.6566-0.5833 1.0573l0.58333-0.36458v0.60156c-0.0165 0.1138-0.0024 0.2322-0.0091 0.3464-0.4087 0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551 0.0091-1.2669 0.8038-0.8625 1.6202-1.7561 2.0964-2.8529h0.78385c0.5478 0.2654 0.2357-0.5881 0.4557-0.556zm-1.1576 7.8204c0.095099-0.010145 0.20328 0.011573 0.31901 0.072921 0.73794 0.10562 1.2897 0.6409 1.8776 1.0482 0.46872 0.46452 1.4828 0.31578 1.5951 1.1029-0.17061 0.85375-1.0105 1.3122-1.75 1.6133-0.1846 0.103-0.383 0.185-0.5925 0.219-0.6856 0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941 0.0182-0.397 0.235-1.0134 0.6471-1.0573z"/>
 </svg>
diff --git a/core/img/actions/rename.svg b/core/img/actions/rename.svg
index 44b464c850f8559376e90f8b26395926a202fafa..d6779709d96b711d867f92544f07ff7798e9f94a 100644
--- a/core/img/actions/rename.svg
+++ b/core/img/actions/rename.svg
@@ -1,72 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="rename.svg"
-   inkscape:export-filename="/home/jancborchardt/rename.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.9609376"
-     inkscape:cx="13.152158"
-     inkscape:cy="4.0337477"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="M 12.59375 1.34375 C 12.0625 1.3125 11.5 1.5 11 2 L 14 5 C 15.5 3.5 14.1875 1.4375 12.59375 1.34375 z M 10 3 L 3 10 L 1 15 L 6 13 L 13 6 L 10 3 z M 3.5 10.5 L 5.5 12.5 L 3 14 L 2 13 L 3.5 10.5 z "
-       transform="translate(0,1036.3622)"
-       id="path3086" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m12.594 1.3438c-0.532-0.0313-1.094 0.1562-1.594 0.6562l3 3c1.5-1.5 0.188-3.5625-1.406-3.6562zm-2.594 1.6562l-7 7-2 5 5-2 7-7-3-3zm-6.5 7.5l2 2-2.5 1.5-1-1 1.5-2.5z" transform="translate(0 1036.4)"/>
+ </g>
 </svg>
diff --git a/core/img/actions/search.png b/core/img/actions/search.png
index 98e1d73ee3418b05bd79b285495c35784294d8ea..312e4f419e589ad575cce37e27ab3d906d733d74 100644
Binary files a/core/img/actions/search.png and b/core/img/actions/search.png differ
diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg
index c8d9d848c4673e68b21d315eba37d5cc23f2243a..4f27369dbbcbe9fc58a3c873b384aa6b35c7279a 100644
--- a/core/img/actions/search.svg
+++ b/core/img/actions/search.svg
@@ -1,1632 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="icons-single.svg"
-   inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/search.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="2.8284273"
-     inkscape:cx="-44.315999"
-     inkscape:cy="38.30965"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg11300">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g3252">
-    <g
-       id="layer1-4">
-      <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3220-5"
-         d="m 6,1.9992355 c -2.7614237,0 -5,2.2385763 -5,5 0,2.7614237 2.2385763,4.9999995 5,4.9999995 0.9847834,0 1.8822735,-0.289667 2.65625,-0.78125 l 4.46875,4.625 c 0.09558,0.105267 0.226186,0.164519 0.375,0.15625 0.148816,-0.0083 0.303095,-0.07119 0.40625,-0.1875 l 0.9375,-1.0625 c 0.191938,-0.220889 0.195486,-0.535924 0,-0.71875 L 10.25,9.6242355 c 0.477599,-0.7663478 0.75,-1.6555164 0.75,-2.625 0,-2.7614237 -2.2385763,-5 -5,-5 z m 0,2 c 1.6568542,0 3,1.3431458 3,3 0,1.6568542 -1.3431458,3 -3,3 -1.6568542,0 -3,-1.3431458 -3,-3 0,-1.6568542 1.3431458,-3 3,-3 z" />
-      <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.7;color:#000000;fill:url(#linearGradient3795-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3220"
-         d="M 6,1 C 3.2385763,1 1,3.2385763 1,6 c 0,2.7614237 2.2385763,5 5,5 0.9847834,0 1.8822735,-0.289667 2.65625,-0.78125 l 4.46875,4.625 c 0.09558,0.105267 0.226186,0.164519 0.375,0.15625 0.148816,-0.0083 0.303095,-0.07119 0.40625,-0.1875 l 0.9375,-1.0625 c 0.191938,-0.220889 0.195486,-0.535924 0,-0.71875 L 10.25,8.625 C 10.727599,7.8586522 11,6.9694836 11,6 11,3.2385763 8.7614237,1 6,1 z M 6,3 C 7.6568542,3 9,4.3431458 9,6 9,7.6568542 7.6568542,9 6,9 4.3431458,9 3,7.6568542 3,6 3,4.3431458 4.3431458,3 6,3 z" />
-    </g>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="38.409" gradientUnits="userSpaceOnUse" x2="46.396" gradientTransform="matrix(-.41002 0 0 .54471 28.023 -5.922)" y1="12.708" x1="46.396">
+   <stop offset="0"/>
+   <stop stop-color="#363636" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+  <path opacity=".6" style="color:#000000" d="m6 1.9992c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.4068c0.4776-0.76635 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/>
+  <path opacity=".7" style="color:#000000" d="m6 1c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.406c0.478-0.7663 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#a)"/>
+ </g>
 </svg>
diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
index 8b3acb00a4fa9a7d8f92a05926927ae242c0f07c..9ada3087707a6b9c2248aee03a2a42a0773d8a75 100644
Binary files a/core/img/actions/settings.png and b/core/img/actions/settings.png differ
diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg
index da685e8be0b6818909b4d896cf1848010cff65a5..bd7ae3b3d7f62586a00c71d21fbb5d26d083b6ed 100644
--- a/core/img/actions/settings.svg
+++ b/core/img/actions/settings.svg
@@ -1,270 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg2457"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="settings.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="17.875"
-     inkscape:cx="-0.41568268"
-     inkscape:cy="1.2867133"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2457" />
-  <defs
-     id="defs2459">
-    <linearGradient
-       id="linearGradient5128">
-      <stop
-         id="stop5130"
-         style="stop-color:#e5e5e5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5132"
-         style="stop-color:#ababab;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="86.132919"
-       y1="105.105"
-       x2="84.63858"
-       y2="20.895"
-       id="linearGradient3260"
-       xlink:href="#linearGradient5128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(9.6142312e-2,0,0,9.6142312e-2,1.8468935,1.9430362)" />
-    <linearGradient
-       id="linearGradient3397">
-      <stop
-         id="stop3399"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3401"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21"
-       y1="0"
-       x2="21"
-       y2="16.004715"
-       id="linearGradient3264"
-       xlink:href="#linearGradient3397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105"
-       id="linearGradient3262"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309-5"
-       id="linearGradient3066-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311-3"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313-3"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3920"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678-0"
-       id="linearGradient3920-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       id="linearGradient3678-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680-5" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3784"
-       x1="0.5"
-       y1="7.5560002"
-       x2="15.5"
-       y2="7.5560002"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3810"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3813"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,10.462268,-5.974418)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       x1="7.4930072"
-       y1="0.0035526801"
-       x2="7.4930072"
-       y2="14.998127" />
-  </defs>
-  <g
-     transform="translate(0.027972,0.944)"
-     id="g2479-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-       id="path2426-2"
-       d="M 6.9375,0.056 C 6.6890831,0.056 6.5,0.245082 6.5,0.4935 l 0,1.25 C 5.9460971,1.885701 5.448836,2.115378 4.96875,2.39975 L 4.0625,1.4935 c -0.1756569,-0.175658 -0.449342,-0.175658 -0.625,0 l -1.5,1.5 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 L 2.84375,4.52475 C 2.5593789,5.004836 2.329701,5.502097 2.1875,6.056 l -1.25,0 C 0.68908301,6.056 0.5,6.245082 0.5,6.4935 l 0,2.125 c 1e-8,0.248418 0.189083,0.4375 0.4375,0.4375 l 1.25,0 c 0.1422009,0.553903 0.371879,1.051164 0.65625,1.53125 L 1.9375,11.4935 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 l 1.5,1.5 c 0.1756579,0.175658 0.449342,0.175658 0.625,0 L 4.96875,12.71225 C 5.4488361,12.996622 5.946097,13.2263 6.5,13.3685 l 0,1.25 c 1e-7,0.248418 0.189083,0.4375 0.4375,0.4375 l 2.125,0 C 9.3109176,15.056 9.5,14.866918 9.5,14.6185 l 0,-1.25 c 0.553903,-0.1422 1.051164,-0.371878 1.53125,-0.65625 l 0.90625,0.90625 c 0.175658,0.175658 0.449342,0.175658 0.625,0 l 1.5,-1.5 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 L 13.15625,10.58725 C 13.440622,10.107164 13.6703,9.609903 13.8125,9.056 l 1.25,0 C 15.310918,9.056 15.5,8.866917 15.5,8.6185 l 0,-2.125 C 15.5,6.245082 15.310917,6.056 15.0625,6.056 l -1.25,0 C 13.6703,5.502097 13.440622,5.004836 13.15625,4.52475 L 14.0625,3.6185 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 l -1.5,-1.5 c -0.175658,-0.175658 -0.449342,-0.175658 -0.625,0 L 11.03125,2.39975 C 10.551164,2.115378 10.053903,1.885701 9.5,1.7435 l 0,-1.25 C 9.4999996,0.245082 9.310918,0.056 9.0625,0.056 z M 8,4.2133427 c 1.8451469,0 3.342657,1.4975104 3.342657,3.3426573 0,1.8451469 -1.4975101,3.342657 -3.342657,3.342657 C 6.1548531,10.898657 4.6573427,9.4011469 4.6573427,7.556 4.6573427,5.7108531 6.1548531,4.2133427 8,4.2133427 z"
-       sodipodi:nodetypes="ssccssssccssssccssssccssssccssssccssssccssssccssssssss" />
-  </g>
-  <g
-     id="g2479"
-     transform="translate(0,-0.056)"
-     style="fill-opacity:1;fill:url(#linearGradient3784);opacity:0.7">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3816);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-       id="path2426"
-       d="M 6.9375,0.056 C 6.6890831,0.056 6.5,0.245082 6.5,0.4935 l 0,1.25 C 5.9460971,1.885701 5.448836,2.115378 4.96875,2.39975 L 4.0625,1.4935 c -0.1756569,-0.175658 -0.449342,-0.175658 -0.625,0 l -1.5,1.5 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 L 2.84375,4.52475 C 2.5593789,5.004836 2.329701,5.502097 2.1875,6.056 l -1.25,0 C 0.68908301,6.056 0.5,6.245082 0.5,6.4935 l 0,2.125 c 1e-8,0.248418 0.189083,0.4375 0.4375,0.4375 l 1.25,0 c 0.1422009,0.553903 0.371879,1.051164 0.65625,1.53125 L 1.9375,11.4935 c -0.175657,0.175658 -0.175657,0.449342 0,0.625 l 1.5,1.5 c 0.1756579,0.175658 0.449342,0.175658 0.625,0 L 4.96875,12.71225 C 5.4488361,12.996622 5.946097,13.2263 6.5,13.3685 l 0,1.25 c 1e-7,0.248418 0.189083,0.4375 0.4375,0.4375 l 2.125,0 C 9.3109176,15.056 9.5,14.866918 9.5,14.6185 l 0,-1.25 c 0.553903,-0.1422 1.051164,-0.371878 1.53125,-0.65625 l 0.90625,0.90625 c 0.175658,0.175658 0.449342,0.175658 0.625,0 l 1.5,-1.5 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 L 13.15625,10.58725 C 13.440622,10.107164 13.6703,9.609903 13.8125,9.056 l 1.25,0 C 15.310918,9.056 15.5,8.866917 15.5,8.6185 l 0,-2.125 C 15.5,6.245082 15.310917,6.056 15.0625,6.056 l -1.25,0 C 13.6703,5.502097 13.440622,5.004836 13.15625,4.52475 L 14.0625,3.6185 c 0.175658,-0.175658 0.175658,-0.449342 0,-0.625 l -1.5,-1.5 c -0.175658,-0.175658 -0.449342,-0.175658 -0.625,0 L 11.03125,2.39975 C 10.551164,2.115378 10.053903,1.885701 9.5,1.7435 l 0,-1.25 C 9.4999996,0.245082 9.310918,0.056 9.0625,0.056 z M 8,4.2133427 c 1.8451469,0 3.342657,1.4975104 3.342657,3.3426573 0,1.8451469 -1.4975101,3.342657 -3.342657,3.342657 C 6.1548531,10.898657 4.6573427,9.4011469 4.6573427,7.556 4.6573427,5.7108531 6.1548531,4.2133427 8,4.2133427 z"
-       sodipodi:nodetypes="ssccssssccssssccssssccssssccssssccssssccssssccssssssss" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="c" y2="7.556" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="15.5" y1="7.556" x1=".5"/>
+  <linearGradient id="a">
+   <stop offset="0"/>
+   <stop stop-color="#363636" offset="1"/>
+  </linearGradient>
+  <linearGradient id="b" y2="14.998" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="7.493" y1=".0035527" x1="7.493"/>
+ </defs>
+ <g opacity=".6" transform="translate(.027972 .944)" fill="#fff">
+  <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="#fff"/>
+ </g>
+ <g opacity=".7" transform="translate(0 -.056)" fill="url(#c)">
+  <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="url(#b)"/>
+ </g>
 </svg>
diff --git a/core/img/actions/share.svg b/core/img/actions/share.svg
index a5f2f8cb4d2a4e745ac14e8b706764538ec3c34e..d67d35c6e5668b77afb88c2d49c3b69d9bedb7d2 100644
--- a/core/img/actions/share.svg
+++ b/core/img/actions/share.svg
@@ -1,70 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="share.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="-4.1004833"
-     inkscape:cy="12.085717"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="8"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;overflow:visible"
-       d="m 12.227825,1037.3622 c -1.356528,0 -2.45919,1.0977 -2.45919,2.4542 0,0.075 0.0084,0.1504 0.0149,0.2236 l -4.734564,2.4145 c -0.429101,-0.3667 -0.986112,-0.5863 -1.594748,-0.5863 -1.356527,0 -2.454223,1.0977 -2.454223,2.4543 0,1.3565 1.097696,2.4542 2.454223,2.4542 0.546067,0 1.052763,-0.1755 1.46061,-0.477 l 4.863734,2.4741 c -0.0024,0.044 -0.0099,0.089 -0.0099,0.1342 0,1.3565 1.102663,2.4542 2.45919,2.4542 1.356527,0 2.454223,-1.0977 2.454223,-2.4542 0,-1.3565 -1.097696,-2.4592 -2.454223,-2.4592 -0.636532,0 -1.218019,0.2437 -1.654365,0.6409 L 5.878678,1044.7 c 0.01892,-0.1228 0.03478,-0.2494 0.03478,-0.3775 0,-0.072 -0.0089,-0.1437 -0.0149,-0.2137 l 4.73953,-2.4145 c 0.428025,0.3627 0.984876,0.5813 1.58978,0.5813 1.356527,0 2.454223,-1.1027 2.454223,-2.4592 0,-1.3565 -1.097696,-2.4542 -2.454223,-2.4542 z"
-       id="circle54"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/shared.svg b/core/img/actions/shared.svg
index 2302cc98919cbf01035c654ca0716fcfeab03b87..3e63cc54687186e3a83ae7bca6121190d41bb40e 100644
--- a/core/img/actions/shared.svg
+++ b/core/img/actions/shared.svg
@@ -1,1738 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="users.svg"
-   inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/personal.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="5.8712803"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3417"
-       xlink:href="#linearGradient3587-6-5-10"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="20.074369"
-       x2="14.152531"
-       y1="-1.4095211"
-       x1="14.501121"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3437"
-       xlink:href="#linearGradient3587-6-5-19"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       inkscape:connector-curvature="0"
-       id="path2880-5-3-9-2"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 4.5688738,2.4830511 c -0.9648083,0 -1.7832921,0.7055933 -1.7832921,1.6161756 0.00685,0.2878093 0.032588,0.6427159 0.2043359,1.3932536 l 0,0.018581 0.018574,0.018573 c 0.055135,0.1579316 0.1353681,0.2482737 0.2414872,0.3715352 0.1061191,0.1232607 0.2326347,0.2683371 0.3529435,0.3901106 0.014154,0.014326 0.023227,0.023201 0.037149,0.037163 0.023859,0.10383 0.052763,0.2155718 0.074304,0.3158043 0.057317,0.2666774 0.051439,0.4555265 0.037155,0.5201477 C 3.3369413,7.3099685 2.8211499,7.4833329 2.3583332,7.6845423 2.098497,7.797507 1.8633735,7.8983808 1.6710221,8.0189236 1.4786714,8.1394673 1.2873756,8.2305391 1.2251996,8.501919 c -7.972e-4,0.012367 -7.972e-4,0.024787 0,0.037163 -0.060756,0.5578815 -0.1526614,1.3782525 -0.2229116,1.931979 -0.0151658,0.116557 0.046264,0.239427 0.1486075,0.297228 0.8403342,0.453932 2.131186,0.636628 3.4179767,0.631608 1.2867901,-0.005 2.5673618,-0.198451 3.3808242,-0.631608 0.1023419,-0.0578 0.1637753,-0.180671 0.1486076,-0.297228 C 8.0758756,10.297976 8.0483234,9.9076775 8.0240004,9.5236465 7.9996757,9.1396165 7.9785611,8.761852 7.9496986,8.5390808 7.9396279,8.4838569 7.9135213,8.4316576 7.8753932,8.3904667 7.6169852,8.0818878 7.2309122,7.8932484 6.7794115,7.7031288 6.3672181,7.5295608 5.8839866,7.3493151 5.4047914,7.1458272 c -0.02682,-0.059748 -0.053461,-0.233582 0,-0.5015715 0.014356,-0.071959 0.036836,-0.1490327 0.055729,-0.2229212 0.045032,-0.05044 0.080132,-0.091658 0.1300317,-0.1486132 C 5.6969774,6.1512485 5.8113313,6.023821 5.9063431,5.9011869 6.0013555,5.7785519 6.0790889,5.6733465 6.1292547,5.5296516 l 0.018574,-0.018581 C 6.3419943,4.7274034 6.3420955,4.4003931 6.352165,4.1178159 l 0,-0.018573 c 0,-0.9105811 -0.818482,-1.6161744 -1.7832922,-1.6161744 z M 9.6699343,0.99999453 c -1.4066511,0 -2.5999668,1.02868367 -2.5999668,2.35622057 0.00998,0.4195963 0.047512,0.9370148 0.2979133,2.0312236 l 0,0.027083 0.027081,0.027083 c 0.080384,0.230248 0.1973613,0.3619578 0.3520786,0.54166 0.1547174,0.1797023 0.3391718,0.3912086 0.514577,0.5687425 0.020637,0.020887 0.033864,0.033826 0.054161,0.054175 0.034785,0.1513735 0.076926,0.3142816 0.1083314,0.4604109 0.083566,0.3887889 0.074995,0.6641113 0.054171,0.758323 C 7.8738277,8.0371487 7.121825,8.2898971 6.4470573,8.58324 6.0682268,8.7479308 5.7254263,8.8949953 5.4449859,9.0707345 c -0.2804394,0.17574 -0.5593407,0.308514 -0.6499909,0.704158 -0.00116,0.01804 -0.00116,0.03613 0,0.05418 -0.08858,0.8133375 -0.2225741,2.0093535 -0.324996,2.8166315 -0.022111,0.169929 0.067452,0.349061 0.2166637,0.433328 1.2251728,0.661787 3.1071818,0.92814 4.9832698,0.920822 1.8760865,-0.0073 3.7431075,-0.289321 4.9291025,-0.920822 0.14921,-0.08427 0.238778,-0.263399 0.216664,-0.433328 -0.0327,-0.252341 -0.07287,-0.821355 -0.108332,-1.381233 -0.03546,-0.559878 -0.06625,-1.11062 -0.108329,-1.4353995 -0.01468,-0.0805 -0.05274,-0.156611 -0.108333,-0.216664 C 14.113957,9.1625255 13.551078,8.887509 12.892809,8.6103329 12.291848,8.3572881 11.587316,8.094509 10.888669,7.7978433 c -0.0391,-0.087106 -0.07795,-0.3405381 0,-0.7312406 0.02093,-0.1049108 0.05371,-0.2172748 0.08125,-0.3249962 0.06566,-0.073537 0.116829,-0.1336294 0.189581,-0.2166638 0.155164,-0.1770945 0.321887,-0.3628712 0.46041,-0.5416592 0.138524,-0.1787888 0.251856,-0.3321687 0.324996,-0.5416609 l 0.02708,-0.027083 c 0.283087,-1.1425075 0.283235,-1.6192551 0.297916,-2.0312247 l 0,-0.027083 c 0,-1.3275361 -1.193313,-2.3562198 -2.5999669,-2.3562198 z" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.5689 2.4831c-0.96481 0-1.7833 0.70559-1.7833 1.6162 0.00685 0.28781 0.032588 0.64272 0.20434 1.3933v0.018581l0.018574 0.018573c0.055135 0.15793 0.13537 0.24827 0.24149 0.37154 0.10612 0.12326 0.23263 0.26834 0.35294 0.39011 0.014154 0.014326 0.023227 0.023201 0.037149 0.037163 0.023859 0.10383 0.052763 0.21557 0.074304 0.3158 0.057317 0.26668 0.051439 0.45553 0.037155 0.52015-0.4146 0.1454-0.9304 0.3187-1.3932 0.5199-0.2598 0.113-0.4949 0.2139-0.6873 0.3344-0.1923 0.1206-0.3836 0.2116-0.4458 0.483-0.0007972 0.012367-0.0007972 0.024787 0 0.037163-0.060756 0.55788-0.15266 1.3783-0.22291 1.932-0.015166 0.11656 0.046264 0.23943 0.14861 0.29723 0.84033 0.45393 2.1312 0.63663 3.418 0.63161 1.2868-0.005 2.5674-0.19845 3.3808-0.63161 0.10234-0.0578 0.16378-0.18067 0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.059748-0.053461-0.23358 0-0.50157 0.014356-0.071959 0.036836-0.14903 0.055729-0.22292 0.045032-0.05044 0.080132-0.091658 0.13003-0.14861 0.1064-0.1215 0.2207-0.2489 0.3157-0.3715 0.0951-0.1226 0.1728-0.2279 0.223-0.3715l0.018574-0.018581c0.1941-0.7837 0.1942-1.1107 0.2043-1.3933v-0.018573c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067 0-2.6 1.0287-2.6 2.3562 0.00998 0.4196 0.047512 0.93701 0.29791 2.0312v0.027083l0.027081 0.027083c0.080384 0.23025 0.19736 0.36196 0.35208 0.54166s0.33917 0.39121 0.51458 0.56874c0.020637 0.020887 0.033864 0.033826 0.054161 0.054175 0.034785 0.15137 0.076926 0.31428 0.10833 0.46041 0.083566 0.38879 0.074995 0.66411 0.054171 0.75832-0.6045 0.2122-1.3565 0.465-2.0312 0.7583-0.3789 0.1647-0.7217 0.3118-1.0021 0.4875-0.28044 0.17574-0.55934 0.30851-0.64999 0.70416-0.00116 0.01804-0.00116 0.03613 0 0.05418-0.08858 0.81334-0.22257 2.0094-0.325 2.8166-0.022111 0.16993 0.067452 0.34906 0.21666 0.43333 1.2252 0.66179 3.1072 0.92814 4.9833 0.92082 1.8761-0.0073 3.7431-0.28932 4.9291-0.92082 0.14921-0.08427 0.23878-0.2634 0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.087106-0.07795-0.34054 0-0.73124 0.02093-0.10491 0.05371-0.21727 0.08125-0.325 0.06566-0.073537 0.11683-0.13363 0.18958-0.21666 0.15516-0.17709 0.32189-0.36287 0.46041-0.54166s0.25186-0.33217 0.325-0.54166l0.02708-0.027083c0.28309-1.1425 0.28324-1.6193 0.29792-2.0312v-0.027083c0-1.3275-1.1933-2.3562-2.6-2.3562z"/>
 </svg>
diff --git a/core/img/actions/sound-off.svg b/core/img/actions/sound-off.svg
index 053291311faa708c2ba53dc8885d4e15ef9b7238..701d7a1a64ed788dacf184a0c4d3c9cb945dc7f3 100644
--- a/core/img/actions/sound-off.svg
+++ b/core/img/actions/sound-off.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="sound.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/sound.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.1681698"
-     inkscape:cx="17.017228"
-     inkscape:cy="33.367762"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 1,1042.3622 0,4 3,0 3,3 1,0 0,-10 -1,0 -3,3 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m1 1042.4v4h3l3 3h1v-10h-1l-3 3z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/sound.svg b/core/img/actions/sound.svg
index 6feea076a4448d68ef91feef5152168091fc8d28..ecadf7dae902cb2f313e8cddf46d716c58010677 100644
--- a/core/img/actions/sound.svg
+++ b/core/img/actions/sound.svg
@@ -1,78 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="sound-off.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/pause.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.1681698"
-     inkscape:cx="17.017228"
-     inkscape:cy="33.367762"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 1,1042.3622 0,4 3,0 3,3 1,0 0,-10 -1,0 -3,3 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 13.25,1039.3622 -0.78125,0.625 c 0.965189,1.1998 1.53125,2.7153 1.53125,4.375 0,1.6597 -0.566061,3.1752 -1.53125,4.375 l 0.78125,0.625 c 1.098257,-1.3697 1.75,-3.1078 1.75,-5 0,-1.8922 -0.651743,-3.6303 -1.75,-5 z m -1.5625,1.25 -0.8125,0.6563 c 0.687912,0.8565 1.125,1.9096 1.125,3.0937 0,1.1841 -0.437088,2.2372 -1.125,3.0938 l 0.8125,0.6562 c 0.823121,-1.0271 1.3125,-2.3314 1.3125,-3.75 0,-1.4186 -0.489379,-2.7229 -1.3125,-3.75 z m -1.5625,1.25 -0.78125,0.625 c 0.411273,0.5135 0.65625,1.1659 0.65625,1.875 0,0.7091 -0.244977,1.3615 -0.65625,1.875 l 0.78125,0.625 c 0.545316,-0.6836 0.875,-1.5576 0.875,-2.5 0,-0.9424 -0.329684,-1.8164 -0.875,-2.5 z"
-       id="path3105"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m1 1042.4v4h3l3 3h1v-10h-1l-3 3z"/>
+  <path d="m13.25 1039.4-0.78125 0.625c0.96519 1.1998 1.5312 2.7153 1.5312 4.375s-0.56606 3.1752-1.5312 4.375l0.78125 0.625c1.0983-1.3697 1.75-3.1078 1.75-5s-0.65174-3.6303-1.75-5zm-1.5625 1.25-0.8125 0.6563c0.68791 0.8565 1.125 1.9096 1.125 3.0937s-0.43709 2.2372-1.125 3.0938l0.8125 0.6562c0.82312-1.0271 1.3125-2.3314 1.3125-3.75s-0.48938-2.7229-1.3125-3.75zm-1.5625 1.25-0.78125 0.625c0.41127 0.5135 0.65625 1.1659 0.65625 1.875s-0.24498 1.3615-0.65625 1.875l0.78125 0.625c0.54532-0.6836 0.875-1.5576 0.875-2.5s-0.32968-1.8164-0.875-2.5z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png
index 6ef3f2227b7a3bc0dc5eccf87a4158564cfdd065..d06e5cb32b5a7c5d3ae69bf421ef0e21f7cfd318 100644
Binary files a/core/img/actions/toggle.png and b/core/img/actions/toggle.png differ
diff --git a/core/img/actions/toggle.svg b/core/img/actions/toggle.svg
index 82a5171477ee0d4c864f50567cc82b28edf88787..1b774a19b110e106d59651325dc8d6a3d1a90344 100644
--- a/core/img/actions/toggle.svg
+++ b/core/img/actions/toggle.svg
@@ -1,61 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="16px"
-   height="9px"
-   viewBox="0 0 16 9"
-   overflow="visible"
-   enable-background="new 0 0 16 9"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="eye_all.svg"><metadata
-   id="metadata12"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1021"
-   id="namedview10"
-   showgrid="false"
-   inkscape:zoom="20.75"
-   inkscape:cx="8.0963855"
-   inkscape:cy="4.5"
-   inkscape:window-x="0"
-   inkscape:window-y="27"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="svg2" />
-<defs
-   id="defs4">
-</defs>
-<path
-   fill="#575756"
-   d="M7.999,0C4.89,0,2.073,1.719,0,4.5C2.073,7.281,4.89,9,7.999,9C11.11,9,13.927,7.281,16,4.5  C13.927,1.719,11.108,0,7.999,0z M8,7.5c-1.657,0-3-1.343-3-3s1.343-3,3-3c1.657,0,3,1.343,3,3S9.657,7.5,8,7.5z"
-   id="path6"
-   style="fill:#222222;fill-opacity:1" />
-<circle
-   fill="#575756"
-   cx="8"
-   cy="4.501"
-   r="1.5"
-   id="circle8"
-   style="fill:#222222;fill-opacity:1" />
-</svg>
\ No newline at end of file
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 16 9" xml:space="preserve" overflow="visible" height="9px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 16 9">
+<path d="m7.999 0c-3.109 0-5.926 1.719-7.999 4.5 2.073 2.781 4.89 4.5 7.999 4.5 3.111 0 5.928-1.719 8.001-4.5-2.073-2.781-4.892-4.5-8.001-4.5zm0.001 7.5c-1.657 0-3-1.343-3-3s1.343-3 3-3c1.657 0 3 1.343 3 3s-1.343 3-3 3z" fill="#222"/>
+<circle cy="4.501" cx="8" r="1.5" fill="#222"/>
+</svg>
diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
index 14825f701146398259292881410727962c776ad8..0ffcf6cbc449edeeceb8951f71c8e37d19ab2270 100644
Binary files a/core/img/actions/triangle-n.png and b/core/img/actions/triangle-n.png differ
diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg
index e8d70fa8ce3387c7e8f7146f247c599f1c03bd2f..4f866978f48df88384209054c7658afeadedc74f 100644
--- a/core/img/actions/triangle-n.svg
+++ b/core/img/actions/triangle-n.svg
@@ -1,88 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg6077"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="triangle-n.svg"
-   inkscape:export-filename="triangle-n.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs6079">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-0.54681372,-0.39376081,0,14.87048,24.63452)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="-6.9113863"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata6082">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 12,12 8,3.9999999 3.9999999,11.989 z"
-       id="path3716"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m12 12-4-8-4 7.989z"/>
 </svg>
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index f36faef2b8ad8c706943eafbed40748ca791e5a0..0f533b142eba0be5834b67ac57ad78f3de822661 100644
Binary files a/core/img/actions/triangle-s.png and b/core/img/actions/triangle-s.png differ
diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
index 396c61e01e22bdf981f039d22840b496673eee2d..b178b20a20bdd4b1f821539e5f8ec94b3c82f02a 100644
--- a/core/img/actions/triangle-s.svg
+++ b/core/img/actions/triangle-s.svg
@@ -1,88 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg6077"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="triangle-s.svg"
-   inkscape:export-filename="/home/tol/tanghus-owncloud/core/img/actions/triangle-s.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs6079">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.54681372,-0.39376081,0,14.87048,-9.6346)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="1.0398514"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata6082">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 4,3.9999999 8,12 12,4.0109999 z"
-       id="path3716"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4 4 4 8 4-7.989z"/>
 </svg>
diff --git a/core/img/actions/upload-white.svg b/core/img/actions/upload-white.svg
index 32ecd8b82b7a320a7bed94351ce5f4e710d85c9e..9c54cac5e1e67630c599d9d98eeb6ced71e57d9f 100644
--- a/core/img/actions/upload-white.svg
+++ b/core/img/actions/upload-white.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="upload.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="774"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 10,1051.3622 -4,0 -1,-7 -4,0 7,-7 7,7 -4,0 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/actions/upload.svg b/core/img/actions/upload.svg
index 718da8f4a59a0a48181bec67681660af6ff8765c..eae4515c7223bb00ef1642f15ebb4b25019d3b74 100644
--- a/core/img/actions/upload.svg
+++ b/core/img/actions/upload.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="upload-white.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/actions/upload-white.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="17.921875"
-     inkscape:cx="-5.3403178"
-     inkscape:cy="10.148736"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="774"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 10,1051.3622 -4,0 -1,-7 -4,0 7,-7 7,7 -4,0 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1036.4)">
+  <path d="m10 1051.4h-4l-1-7h-4l7-7 7 7h-4z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg
index 6d0dc714ce402be6245fc81a7e6ef829d545956d..aa7195737085be476f9f8b49eaa088c003643fd8 100644
--- a/core/img/actions/user.svg
+++ b/core/img/actions/user.svg
@@ -1,1698 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="user.svg"
-   inkscape:export-filename="user.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="16"
-     inkscape:cx="6.2464037"
-     inkscape:cy="5.7411894"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="47.208389"
-       x2="-39.421574"
-       y1="-5.2547116"
-       x1="-39.421574"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3397"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       id="path2880-5-3"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:1"
-       d="m 8.4036095,0.99999982 c -1.7311503,0 -3.199751,1.26607188 -3.199751,2.89996308 0.012287,0.516426 0.058473,1.1532486 0.3666387,2.4999667 l 0,0.033333 0.033328,0.033333 c 0.098928,0.2833818 0.2428905,0.4454861 0.4332995,0.6666581 0.190409,0.2211719 0.4174151,0.4814874 0.6332844,0.6999905 0.025397,0.025708 0.041676,0.041633 0.066656,0.066677 0.04281,0.1863059 0.094672,0.386808 0.1333222,0.5666595 0.1028444,0.4785093 0.092296,0.817368 0.066668,0.93332 -0.7438941,0.26121 -1.6693756,0.572285 -2.4998049,0.9333223 -0.4662227,0.202697 -0.8881034,0.383698 -1.2332384,0.599993 -0.3451339,0.216295 -0.6883746,0.379709 -0.7999369,0.866656 -0.1600387,0.632932 -0.19866,0.753904 -0.399969,1.533302 -0.027212,0.209143 0.083011,0.429614 0.2666456,0.533326 1.507807,0.814508 3.8239751,1.142327 6.1328564,1.13332 2.3088796,-0.009 4.6066016,-0.356087 6.0661936,-1.13332 0.117388,-0.07353 0.143041,-0.108689 0.133323,-0.233305 -0.04365,-0.68908 -0.08154,-1.366916 -0.133319,-1.766644 -0.01807,-0.09908 -0.06492,-0.192753 -0.133324,-0.266663 -0.46366,-0.553698 -1.156389,-0.89218 -1.966513,-1.23332 -0.739597,-0.31144 -1.606657,-0.6348603 -2.4664743,-0.9999873 -0.048123,-0.107207 -0.095926,-0.4191236 0,-0.8999881 0.025759,-0.1291209 0.066096,-0.2674152 0.099994,-0.3999952 0.0808,-0.090507 0.143781,-0.164467 0.233316,-0.2666632 0.190958,-0.2179623 0.396144,-0.4466106 0.56662,-0.6666572 0.170482,-0.2200478 0.309958,-0.4088229 0.399971,-0.6666594 l 0.03333,-0.033333 c 0.34839,-1.4061623 0.348571,-1.9929284 0.366639,-2.4999678 l 0,-0.033333 c 0,-1.6338901 -1.468599,-2.899962 -3.199751,-2.899962 z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccsscscssccccccccscscsscccssc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/>
 </svg>
diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png
index 80339d78229a0047c048fb1560cdd11f86aebbec..330ae09ea73057a29f05e2288787a31300cbb7aa 100644
Binary files a/core/img/actions/view-close.png and b/core/img/actions/view-close.png differ
diff --git a/core/img/actions/view-close.svg b/core/img/actions/view-close.svg
index 45d66976084e8859b414ca9ea418610f23805dc9..1d5b1a9f49fe2bb76700f6e08f8cfe7f3b7d12a6 100644
--- a/core/img/actions/view-close.svg
+++ b/core/img/actions/view-close.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="view-close.svg"
-   inkscape:export-filename="view-close.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3363397"
-     inkscape:cx="4.7098147"
-     inkscape:cy="23.356371"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 6,1028.3622 2,-2 8,7 8,-7 2,2 -7,8 7,8 -2,2 -8,-7 -8,7 -2,-2 7,-8 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+  <path d="m6 1028.4 2-2 8 7 8-7 2 2-7 8 7 8-2 2-8-7-8 7-2-2 7-8z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/actions/view-next.png b/core/img/actions/view-next.png
index b76bea06713c6bd66eb4913a70f8ce88b55d5829..f9e6174ae3fca018910d4d640242f3a1451b2e65 100644
Binary files a/core/img/actions/view-next.png and b/core/img/actions/view-next.png differ
diff --git a/core/img/actions/view-next.svg b/core/img/actions/view-next.svg
index d5642f1a11cb50d4bd0c81bad1d1a732e4c45a0a..07c95b73ff0e40bfd7bdbc398c5508275ae6e6ee 100644
--- a/core/img/actions/view-next.svg
+++ b/core/img/actions/view-next.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="view-next.svg"
-   inkscape:export-filename="view-next.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3363398"
-     inkscape:cx="30.082863"
-     inkscape:cy="19.387471"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 9,1024.3622 2,-2 14,14 -14,14 -2,-2 10,-12 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+  <path d="m9 1024.4 2-2 14 14-14 14-2-2 10-12z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/actions/view-pause.png b/core/img/actions/view-pause.png
index 64264ff9281a2114a7c662b93c96018ba5da9777..94696bf686876842a9113d016daf15f4468a7425 100644
Binary files a/core/img/actions/view-pause.png and b/core/img/actions/view-pause.png differ
diff --git a/core/img/actions/view-pause.svg b/core/img/actions/view-pause.svg
index 0edc6f14e28059dce9fed6cea3c1235ab77bcffc..d901a4d789ec2a119b3853e34b55b0f0325666cb 100644
--- a/core/img/actions/view-pause.svg
+++ b/core/img/actions/view-pause.svg
@@ -1,72 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="pause.svg"
-   inkscape:export-filename="view-pause.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3363397"
-     inkscape:cx="8.9383019"
-     inkscape:cy="10.400115"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 6,1026.3622 0,20 8,0 0,-20 -8,0 z m 12,0 0,20 8,0 0,-20 -8,0 z"
-       id="path3086"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+  <path fill="#fff" d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z"/>
+ </g>
 </svg>
diff --git a/core/img/actions/view-play.png b/core/img/actions/view-play.png
index 0080d45b5cdc57d396bba4ade8c42b36ea197edd..721787d9c44eb9e84b055eecdffd260d47b87c86 100644
Binary files a/core/img/actions/view-play.png and b/core/img/actions/view-play.png differ
diff --git a/core/img/actions/view-play.svg b/core/img/actions/view-play.svg
index 0bdc63bf7e1d07e21af60d0e8982c35059750be0..d9fa355371c6daa38ce75a10f0d7624bff1beb40 100644
--- a/core/img/actions/view-play.svg
+++ b/core/img/actions/view-play.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="play.svg"
-   inkscape:export-filename="view-play.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3363397"
-     inkscape:cx="12.629914"
-     inkscape:cy="9.5218526"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 4,1024.3622 24,12 -24,12 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+  <path d="m4 1024.4 24 12-24 12z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/actions/view-previous.png b/core/img/actions/view-previous.png
index 82943c23a59ca65b54c2882c4a2ea8901fb42998..97b41a195ff97cc7122b27f9b0245e7c3d3dca43 100644
Binary files a/core/img/actions/view-previous.png and b/core/img/actions/view-previous.png differ
diff --git a/core/img/actions/view-previous.svg b/core/img/actions/view-previous.svg
index df1f49511d070184f4f5d98311b8e2d60190d5d8..68a31c044336a74e748db3b6d998131bad805e98 100644
--- a/core/img/actions/view-previous.svg
+++ b/core/img/actions/view-previous.svg
@@ -1,73 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="view-next.svg"
-   inkscape:export-filename="view-previous.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.67268"
-     inkscape:cx="13.313675"
-     inkscape:cy="18.927817"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
-       id="path2984"
-       d="m 23,1024.3622 -2,-2 -14,14 14,14 2,-2 -10,-12 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1020.4)">
+  <path d="m23 1024.4-2-2-14 14 14 14 2-2-10-12z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/appstore.png b/core/img/appstore.png
index 009b2b51b98ae5ccaa835aa56a350142dfb2e827..234aa0bb6be0ebf1f215d49a674cfc25a111ff3f 100644
Binary files a/core/img/appstore.png and b/core/img/appstore.png differ
diff --git a/core/img/breadcrumb-start.svg b/core/img/breadcrumb-start.svg
index 4197763dc6ca678f1cb2d032e51427925fb81212..7f36231cdf8d370d8abc8ea1cb2ea50b21f0c657 100644
--- a/core/img/breadcrumb-start.svg
+++ b/core/img/breadcrumb-start.svg
@@ -1,71 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="11"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.657977"
-     inkscape:cx="2.6788772"
-     inkscape:cy="16.807262"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3760"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1016.3622)">
-    <path
-       transform="translate(0,1016.3622)"
-       style="fill:#dddddd;fill-opacity:1;stroke:none"
-       d="M 0,0 11,18 0,36 z"
-       id="rect3757"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="36" width="11" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1016.4)">
+  <path d="m0 0 11 18-11 18z" transform="translate(0 1016.4)" fill="#ddd"/>
+ </g>
 </svg>
diff --git a/core/img/breadcrumb.svg b/core/img/breadcrumb.svg
index 9d522b42b73ac7918b39f7c2df3c585573097cc9..05a216e50a9eaec7a20be7274957dc6e8ae2f46f 100644
--- a/core/img/breadcrumb.svg
+++ b/core/img/breadcrumb.svg
@@ -1,77 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="11"
-   height="36"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="breadcrumb.svg"
-   inkscape:export-filename="/home/jancborchardt/breadcrumb.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.386364"
-     inkscape:cx="1.7139473"
-     inkscape:cy="25.655289"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3760"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1016.3622)">
-    <path
-       transform="translate(0,1016.3622)"
-       style="fill:#dddddd;fill-opacity:1;stroke:#dddddd;stroke-width:0.89999998000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:31.20000076000000178;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
-       d="m 0.5,0 10,18 -10,18 10,-18 z"
-       id="rect3757"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       inkscape:export-filename="/home/jancborchardt/breadcrumb-start.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="36" width="11" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(0 -1016.4)">
+  <path d="m0.5 0 10 18-10 18 10-18z" transform="translate(0 1016.4)" stroke="#ddd" stroke-linecap="round" stroke-miterlimit="31.2" stroke-width="0.9" fill="#ddd"/>
+ </g>
 </svg>
diff --git a/core/img/desktopapp.png b/core/img/desktopapp.png
index 182ddd2cf18891878210352e9ac0f34d7d89409d..25dae6f197a2f22308ced296cc8bbdd8dc4f9750 100644
Binary files a/core/img/desktopapp.png and b/core/img/desktopapp.png differ
diff --git a/core/img/desktopapp.svg b/core/img/desktopapp.svg
index 93d91e461a613db6c49ce5d498e0e9971492ac98..a983e6f9598c212dec5d377656efb7a2ce847efd 100644
--- a/core/img/desktopapp.svg
+++ b/core/img/desktopapp.svg
@@ -1,100 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="170"
-   height="60"
-   viewBox="0 0 1346.4 475.2"
-   enable-background="new 0 0 792 612"
-   xml:space="preserve"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="desktopapp.svg"
-   inkscape:export-filename="desktopapp.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><metadata
-   id="metadata3043"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs3041" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1280"
-   inkscape:window-height="773"
-   id="namedview3039"
-   showgrid="true"
-   fit-margin-top="3"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="3"
-   inkscape:zoom="2"
-   inkscape:cx="155.97228"
-   inkscape:cy="56.168028"
-   inkscape:window-x="0"
-   inkscape:window-y="-1"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   showguides="true"
-   inkscape:guide-bbox="true"><inkscape:grid
-     type="xygrid"
-     id="grid3146"
-     empspacing="4"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true"
-     originx="-3.5865408e-16px"
-     originy="-3px" /></sodipodi:namedview>
-
-
-<rect
-   id="rect3026"
-   width="1346.3999"
-   height="475.20016"
-   x="-2.8405402e-15"
-   y="-3.5527137e-15"
-   rx="50"
-   ry="50"
-   style="fill:#1a1a1a" /><path
-   d="m 150.48,126.72 c -11.88,0 -23.76,11.88 -23.76,23.76 l 0,166.32 -47.52,23.76 0,11.88 c 0,0 0,11.88 11.88,11.88 l 356.4,0 c 11.88,0 11.88,-11.88 11.88,-11.88 l 0,-11.88 -47.52,-23.76 0,-166.32 c 0,-11.88 -11.88,-23.76 -23.76,-23.76 z m 0,23.66718 237.6,0 0,142.65282 -237.6,0 z"
-   id="path3037"
-   inkscape:connector-curvature="0"
-   sodipodi:nodetypes="sscccsscccsssccccc"
-   style="fill:#ffffff" /><text
-   xml:space="preserve"
-   style="font-size:316.79998778999998876px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
-   x="451.44"
-   y="239.58"
-   id="text2983"
-   sodipodi:linespacing="125%"><tspan
-     sodipodi:role="line"
-     id="tspan2985"
-     x="451.44"
-     y="239.58"
-     style="font-size:126.71999999999999886px;font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:FreeSans Semi-Bold;fill:#ffffff">Desktop app</tspan></text>
-<text
-   xml:space="preserve"
-   style="font-size:316.79998778999998876px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
-   x="493.01996"
-   y="342.54001"
-   id="text2991"
-   sodipodi:linespacing="125%"><tspan
-     sodipodi:role="line"
-     id="tspan2993"
-     x="493.01996"
-     y="342.54001"
-     style="font-size:71.28000000000000114px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:FreeSans;-inkscape-font-specification:FreeSans;fill:#ffffff">Windows, OS X, Linux</tspan></text>
-</svg>
\ No newline at end of file
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 792 612" xml:space="preserve" height="60" viewBox="0 0 1346.4 475.2" width="170" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<rect rx="50" ry="50" height="475.2" width="1346.4" y="-3.5527e-15" x="-2.8405e-15" fill="#1a1a1a"/><path fill="#fff" d="m150.48 126.72c-11.88 0-23.76 11.88-23.76 23.76v166.32l-47.52 23.76v11.88s0 11.88 11.88 11.88h356.4c11.88 0 11.88-11.88 11.88-11.88v-11.88l-47.52-23.76v-166.32c0-11.88-11.88-23.76-23.76-23.76zm0 23.667h237.6v142.65h-237.6z"/><text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="239.58" x="451.44" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-weight="600" font-size="126.72px" y="239.58" x="451.44" font-family="FreeSans" fill="#ffffff">Desktop app</tspan></text>
+<text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="342.54001" x="493.01996" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="71.28px" y="342.54001" x="493.01996" font-family="FreeSans" fill="#ffffff">Windows, OS X, Linux</tspan></text>
+</svg>
diff --git a/core/img/favicon-touch.svg b/core/img/favicon-touch.svg
index 6d766d3ced328b30f7a53c9dedeaa4f67030f8b1..68f36a8a9ac7822c978782049f6a06e34bbeddd4 100644
--- a/core/img/favicon-touch.svg
+++ b/core/img/favicon-touch.svg
@@ -1,787 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="128"
-   height="128"
-   viewBox="0 0 128 127.99999"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="favicon.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/favicon.png"
-   inkscape:export-xdpi="89.826416"
-   inkscape:export-ydpi="89.826416"><metadata
-   id="metadata327"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs325"><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_1_"
-   id="linearGradient3353"
-   gradientUnits="userSpaceOnUse"
-   x1="288.49411"
-   y1="55.888199"
-   x2="288.49411"
-   y2="339.22189" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_2_"
-   id="linearGradient3355"
-   gradientUnits="userSpaceOnUse"
-   x1="251.2114"
-   y1="55.888199"
-   x2="251.2114"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_3_"
-   id="linearGradient3357"
-   gradientUnits="userSpaceOnUse"
-   x1="293.22461"
-   y1="55.888199"
-   x2="293.22461"
-   y2="339.22171" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_4_"
-   id="linearGradient3359"
-   gradientUnits="userSpaceOnUse"
-   x1="375.33401"
-   y1="55.888199"
-   x2="375.33401"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_5_"
-   id="linearGradient3361"
-   gradientUnits="userSpaceOnUse"
-   x1="334.49411"
-   y1="55.888199"
-   x2="334.49411"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_6_"
-   id="linearGradient3363"
-   gradientUnits="userSpaceOnUse"
-   x1="458.42679"
-   y1="55.8867"
-   x2="458.42679"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_7_"
-   id="linearGradient3365"
-   gradientUnits="userSpaceOnUse"
-   x1="413.16309"
-   y1="55.888199"
-   x2="413.16309"
-   y2="339.22131" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_8_"
-   id="linearGradient3367"
-   gradientUnits="userSpaceOnUse"
-   x1="290.76169"
-   y1="55.8867"
-   x2="290.76169"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_9_"
-   id="linearGradient3369"
-   gradientUnits="userSpaceOnUse"
-   x1="346.77341"
-   y1="55.888199"
-   x2="346.77341"
-   y2="339.22119" />
-	<linearGradient
-   y2="339.22189"
-   x2="288.49411"
-   y1="55.888199"
-   x1="288.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop261"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop263"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="251.2114"
-   y1="55.888199"
-   x1="251.2114"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop268"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop270"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22171"
-   x2="293.22461"
-   y1="55.888199"
-   x1="293.22461"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop275"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop277"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="375.33401"
-   y1="55.888199"
-   x1="375.33401"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_4_">
-		<stop
-   id="stop282"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop284"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="334.49411"
-   y1="55.888199"
-   x1="334.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_5_">
-		<stop
-   id="stop289"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop291"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="458.42679"
-   y1="55.8867"
-   x1="458.42679"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_6_">
-		<stop
-   id="stop296"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop298"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22131"
-   x2="413.16309"
-   y1="55.888199"
-   x1="413.16309"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_7_">
-		<stop
-   id="stop303"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop305"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="290.76169"
-   y1="55.8867"
-   x1="290.76169"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_8_">
-		<stop
-   id="stop310"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop312"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22119"
-   x2="346.77341"
-   y1="55.888199"
-   x1="346.77341"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_9_">
-		<stop
-   id="stop317"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop319"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-<linearGradient
-   y2="18.967093"
-   x2="-2.4040222"
-   y1="4.4573336"
-   x1="-2.4040222"
-   gradientTransform="translate(13.927091,16.573387)"
-   gradientUnits="userSpaceOnUse"
-   id="linearGradient3475"
-   xlink:href="#linearGradient3587-6-5-26"
-   inkscape:collect="always" /><linearGradient
-   id="linearGradient3587-6-5-26"><stop
-     id="stop3589-9-2-45"
-     style="stop-color:#000000;stop-opacity:1"
-     offset="0" /><stop
-     id="stop3591-7-4-20"
-     style="stop-color:#363636;stop-opacity:1"
-     offset="1" /></linearGradient></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1280"
-   inkscape:window-height="774"
-   id="namedview323"
-   showgrid="false"
-   inkscape:zoom="2"
-   inkscape:cx="121.64549"
-   inkscape:cy="57.492689"
-   inkscape:window-x="0"
-   inkscape:window-y="26"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   units="px"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-<pattern
-   y="565.223"
-   width="69"
-   height="69"
-   patternUnits="userSpaceOnUse"
-   id="Polka_Dot_Pattern"
-   viewBox="2.125 -70.896 69 69"
-   overflow="visible">
-	<g
-   id="g4">
-		<polygon
-   fill="none"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon6" />
-		<polygon
-   fill="#F6BB60"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon8" />
-		<g
-   id="g10">
-			<path
-   fill="#FFFFFF"
-   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path12" />
-			<path
-   fill="#FFFFFF"
-   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path14" />
-			<path
-   fill="#FFFFFF"
-   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path16" />
-			<path
-   fill="#FFFFFF"
-   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path18" />
-			<path
-   fill="#FFFFFF"
-   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path20" />
-			<path
-   fill="#FFFFFF"
-   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path22" />
-			<path
-   fill="#FFFFFF"
-   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path24" />
-			<path
-   fill="#FFFFFF"
-   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path26" />
-			<path
-   fill="#FFFFFF"
-   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path28" />
-		</g>
-		<g
-   id="g30">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path32" />
-		</g>
-		<path
-   fill="#FFFFFF"
-   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path34" />
-		<g
-   id="g36">
-			<g
-   id="g38">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path40" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path42" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path44" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path46" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path48" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path50" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path52" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path54" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path56" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path58" />
-			</g>
-			<g
-   id="g60">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path62" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path64" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path66" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path68" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path70" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path72" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path74" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path76" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path78" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path80" />
-			</g>
-			<g
-   id="g82">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path84" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path86" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path88" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path90" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path92" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path94" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path96" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path98" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path100" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path102" />
-			</g>
-			<g
-   id="g104">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path106" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path108" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path110" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path112" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path114" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path116" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path118" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path120" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
-   id="path122" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path124" />
-			</g>
-			<g
-   id="g126">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path128" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path130" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path132" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path134" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path136" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path138" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path140" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path142" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path144" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path146" />
-			</g>
-			<g
-   id="g148">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path150" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path152" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path154" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path156" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path158" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path160" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path162" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path164" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path166" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path168" />
-			</g>
-			<g
-   id="g170">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path172" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path174" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path176" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path178" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path180" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path182" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path184" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path186" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path188" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path190" />
-			</g>
-			<g
-   id="g192">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path194" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path196" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path198" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path200" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path202" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path204" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path206" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path208" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path210" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path212" />
-			</g>
-		</g>
-		<g
-   id="g214">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path216" />
-			<path
-   fill="#FFFFFF"
-   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path218" />
-			<path
-   fill="#FFFFFF"
-   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path220" />
-			<path
-   fill="#FFFFFF"
-   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path222" />
-			<path
-   fill="#FFFFFF"
-   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path224" />
-			<path
-   fill="#FFFFFF"
-   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path226" />
-			<path
-   fill="#FFFFFF"
-   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path228" />
-			<path
-   fill="#FFFFFF"
-   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
-   id="path230" />
-			<path
-   fill="#FFFFFF"
-   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
-   id="path232" />
-			<path
-   fill="#FFFFFF"
-   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
-   id="path234" />
-		</g>
-	</g>
-</pattern>
-
-<rect
-   style="fill:#1d2d44;fill-opacity:1"
-   id="rect7667"
-   width="128"
-   height="128"
-   x="0"
-   y="-1.5000001e-06"
-   rx="20"
-   ry="20" /><path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-   d="m 58.33248,29.12399 c -8.931744,0 -16.147768,7.21604 -16.147768,16.14776 0,3.68172 1.225952,7.07024 3.292884,9.78364 4.483908,-5.1898 11.101748,-8.48548 18.490768,-8.48548 3.615048,0 7.043084,0.805 10.13194,2.21636 0.25008,-1.131 0.37996,-2.30724 0.37996,-3.51452 0,-8.93172 -7.216012,-16.14776 -16.147764,-16.14776 z M 37.2454,36.59631 c -4.651408,0 -8.390508,3.77076 -8.390508,8.42216 0,1.506 0.38852,2.92896 1.076512,4.14776 2.80684,-1.58336 6.051864,-2.50132 9.498688,-2.50132 0.33264,0 0.653036,0.012 0.981536,0.032 -0.0372,-0.47152 -0.06328,-0.9438 -0.06328,-1.4248 0,-2.59072 0.562688,-5.05568 1.551452,-7.28232 -1.33128,-0.89272 -2.926288,-1.39312 -4.654356,-1.39312 z m 39.83116,5.7942 c -0.34364,0 -0.674872,0.042 -1.013196,0.0632 0.14636,0.92272 0.25328,1.85444 0.25328,2.81796 0,1.49944 -0.19068,2.94632 -0.538256,4.33772 4.074936,2.25512 7.45902,5.62936 9.68866,9.72032 2.312644,-1.204 4.892476,-1.96952 7.630616,-2.15304 -0.705676,-8.27576 -7.561776,-14.78628 -16.02112,-14.78628 z m -13.108196,6.01584 c -12.498188,0 -22.606872,10.1078 -22.606872,22.60684 0,12.49768 10.108168,22.60688 22.606872,22.60688 12.498716,0 22.60688,-10.1092 22.60688,-22.60688 0,-12.499 -10.10868,-22.60684 -22.60688,-22.60684 z m -24.538272,0.0948 c -9.696224,0 -17.5409,7.84468 -17.5409,17.54092 0,5.70796 2.719624,10.761 6.93404,13.96304 1.776716,-3.42676 5.34516,-5.76252 9.46702,-5.76252 0.498168,0 0.976332,0.0604 1.456464,0.1268 -0.15072,-1.09656 -0.22164,-2.21844 -0.22164,-3.3562 0,-5.43972 1.770672,-10.47008 4.780996,-14.53296 -1.801952,-2.25484 -3.0915,-4.96408 -3.641168,-7.9156 -0.407372,-0.028 -0.820216,-0.0632 -1.234824,-0.0632 z m 54.965732,10.44856 c -2.94422,0 -5.702192,0.75168 -8.137212,2.0264 1.382684,3.06272 2.153036,6.46088 2.153036,10.03692 0,6.69584 -2.692088,12.77572 -7.060688,17.1926 3.209324,3.56304 7.865672,5.7942 13.044864,5.7942 9.696226,0 17.540916,-7.84464 17.540916,-17.54088 0,-9.69624 -7.84469,-17.50924 -17.540916,-17.50924 z m -74.2164,2.31152 C 11.24742,61.26123 4,68.44531 4,77.37731 c 0,8.932 7.24742,16.17944 16.179424,16.17944 3.399648,0 6.5489,-1.0592 9.150408,-2.8496 -1.074996,-1.67044 -1.709768,-3.66752 -1.709768,-5.7942 0,-1.10384 0.16288,-2.16428 0.474928,-3.16624 -4.870276,-3.51968 -8.04222,-9.24728 -8.04222,-15.70448 0,-1.64064 0.2162,-3.22704 0.601592,-4.74936 -0.15996,-0.004 -0.3138,-0.032 -0.47494,-0.032 z m 94.955196,13.86808 c -0.47649,0 -0.93756,0.0544 -1.39314,0.1268 0.0252,0.40276 0.0316,0.79408 0.0316,1.20316 0,5.15012 -2.03206,9.82456 -5.31926,13.29816 1.61719,1.8806 3.99262,3.07124 6.68075,3.07124 4.89645,0 8.86544,-3.93732 8.86544,-8.8338 0,-4.89644 -3.96899,-8.8654 -8.86544,-8.8654 z m -76.844368,0.94984 c -4.8962,0 -8.833776,3.9376 -8.833776,8.8338 0,4.89616 3.937576,8.86544 8.833776,8.86544 3.753,0 6.93856,-2.34184 8.2322,-5.63592 -3.156528,-3.21488 -5.42508,-7.31624 -6.427444,-11.87332 -0.586568,-0.1212 -1.181936,-0.19 -1.804756,-0.19 z"
-   id="circle238"
-   inkscape:export-filename="/home/user/owncloud/core/img/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   inkscape:connector-curvature="0"
-   sodipodi:nodetypes="sscscsscscscscccscscccsssssssscscsccsscscssscsscscsccccscssccsssccs" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
+<svg xml:space="preserve" height="128" viewBox="0 0 128 127.99999" xmlns:dc="http://purl.org/dc/elements/1.1/" width="128" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111">
+<rect rx="20" ry="20" height="128" width="128" y="-0.0000015" x="0" fill="#1d2d44"/><path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m58.332 29.124c-8.9317 0-16.148 7.216-16.148 16.148 0 3.6817 1.226 7.0702 3.2929 9.7836 4.4839-5.1898 11.102-8.4855 18.491-8.4855 3.615 0 7.0431 0.805 10.132 2.2164 0.25008-1.131 0.37996-2.3072 0.37996-3.5145 0-8.9317-7.216-16.148-16.148-16.148zm-21.087 7.472c-4.6514 0-8.3905 3.7708-8.3905 8.4222 0 1.506 0.38852 2.929 1.0765 4.1478 2.8068-1.5834 6.0519-2.5013 9.4987-2.5013 0.33264 0 0.65304 0.012 0.98154 0.032-0.0372-0.47152-0.06328-0.9438-0.06328-1.4248 0-2.5907 0.56269-5.0557 1.5515-7.2823-1.3313-0.89272-2.9263-1.3931-4.6544-1.3931zm39.831 5.7942c-0.34364 0-0.67487 0.042-1.0132 0.0632 0.14636 0.92272 0.25328 1.8544 0.25328 2.818 0 1.4994-0.19068 2.9463-0.53826 4.3377 4.0749 2.2551 7.459 5.6294 9.6887 9.7203 2.3126-1.204 4.8925-1.9695 7.6306-2.153-0.70568-8.2758-7.5618-14.786-16.021-14.786zm-13.108 6.0158c-12.498 0-22.607 10.108-22.607 22.607 0 12.498 10.108 22.607 22.607 22.607s22.607-10.109 22.607-22.607c0-12.499-10.109-22.607-22.607-22.607zm-24.538 0.0948c-9.6962 0-17.541 7.8447-17.541 17.541 0 5.708 2.7196 10.761 6.934 13.963 1.7767-3.4268 5.3452-5.7625 9.467-5.7625 0.49817 0 0.97633 0.0604 1.4565 0.1268-0.15072-1.0966-0.22164-2.2184-0.22164-3.3562 0-5.4397 1.7707-10.47 4.781-14.533-1.802-2.2548-3.0915-4.9641-3.6412-7.9156-0.40737-0.028-0.82022-0.0632-1.2348-0.0632zm54.966 10.449c-2.9442 0-5.7022 0.75168-8.1372 2.0264 1.3827 3.0627 2.153 6.4609 2.153 10.037 0 6.6958-2.6921 12.776-7.0607 17.193 3.2093 3.563 7.8657 5.7942 13.045 5.7942 9.6962 0 17.541-7.8446 17.541-17.541 0-9.6962-7.8447-17.509-17.541-17.509zm-74.216 2.3115c-8.933-0.001-16.18 7.183-16.18 16.115s7.2474 16.179 16.179 16.179c3.3996 0 6.5489-1.0592 9.1504-2.8496-1.075-1.6704-1.7098-3.6675-1.7098-5.7942 0-1.1038 0.16288-2.1643 0.47493-3.1662-4.8703-3.5197-8.0422-9.2473-8.0422-15.704 0-1.6406 0.2162-3.227 0.60159-4.7494-0.15996-0.004-0.3138-0.032-0.47494-0.032zm94.955 13.868c-0.47649 0-0.93756 0.0544-1.3931 0.1268 0.0252 0.40276 0.0316 0.79408 0.0316 1.2032 0 5.1501-2.0321 9.8246-5.3193 13.298 1.6172 1.8806 3.9926 3.0712 6.6808 3.0712 4.8964 0 8.8654-3.9373 8.8654-8.8338 0-4.8964-3.969-8.8654-8.8654-8.8654zm-76.844 0.94984c-4.8962 0-8.8338 3.9376-8.8338 8.8338s3.9376 8.8654 8.8338 8.8654c3.753 0 6.9386-2.3418 8.2322-5.6359-3.1565-3.2149-5.4251-7.3162-6.4274-11.873-0.58657-0.1212-1.1819-0.19-1.8048-0.19z" fill="#fff"/>
+</svg>
diff --git a/core/img/favicon.png b/core/img/favicon.png
index 79b6795f6f6c3b0c9c6b703460f294a3832d0e4e..02936243cb13d8e7bfa816f2b577f748a4615e36 100644
Binary files a/core/img/favicon.png and b/core/img/favicon.png differ
diff --git a/core/img/favicon.svg b/core/img/favicon.svg
index f055c32efb6066c93e32f3bc7cbb3a189a616be4..39cb17426895187ecc5cadcea140591168110807 100644
--- a/core/img/favicon.svg
+++ b/core/img/favicon.svg
@@ -1,796 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="32"
-   height="32"
-   viewBox="0 0 32 31.999997"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="logo-iconbluesmall.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/favicon.png"
-   inkscape:export-xdpi="89.826416"
-   inkscape:export-ydpi="89.826416"><metadata
-   id="metadata327"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs325"><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_1_"
-   id="linearGradient3353"
-   gradientUnits="userSpaceOnUse"
-   x1="288.49411"
-   y1="55.888199"
-   x2="288.49411"
-   y2="339.22189" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_2_"
-   id="linearGradient3355"
-   gradientUnits="userSpaceOnUse"
-   x1="251.2114"
-   y1="55.888199"
-   x2="251.2114"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_3_"
-   id="linearGradient3357"
-   gradientUnits="userSpaceOnUse"
-   x1="293.22461"
-   y1="55.888199"
-   x2="293.22461"
-   y2="339.22171" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_4_"
-   id="linearGradient3359"
-   gradientUnits="userSpaceOnUse"
-   x1="375.33401"
-   y1="55.888199"
-   x2="375.33401"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_5_"
-   id="linearGradient3361"
-   gradientUnits="userSpaceOnUse"
-   x1="334.49411"
-   y1="55.888199"
-   x2="334.49411"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_6_"
-   id="linearGradient3363"
-   gradientUnits="userSpaceOnUse"
-   x1="458.42679"
-   y1="55.8867"
-   x2="458.42679"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_7_"
-   id="linearGradient3365"
-   gradientUnits="userSpaceOnUse"
-   x1="413.16309"
-   y1="55.888199"
-   x2="413.16309"
-   y2="339.22131" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_8_"
-   id="linearGradient3367"
-   gradientUnits="userSpaceOnUse"
-   x1="290.76169"
-   y1="55.8867"
-   x2="290.76169"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_9_"
-   id="linearGradient3369"
-   gradientUnits="userSpaceOnUse"
-   x1="346.77341"
-   y1="55.888199"
-   x2="346.77341"
-   y2="339.22119" />
-	<linearGradient
-   y2="339.22189"
-   x2="288.49411"
-   y1="55.888199"
-   x1="288.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop261"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop263"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="251.2114"
-   y1="55.888199"
-   x1="251.2114"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop268"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop270"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22171"
-   x2="293.22461"
-   y1="55.888199"
-   x1="293.22461"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop275"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop277"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="375.33401"
-   y1="55.888199"
-   x1="375.33401"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_4_">
-		<stop
-   id="stop282"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop284"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="334.49411"
-   y1="55.888199"
-   x1="334.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_5_">
-		<stop
-   id="stop289"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop291"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="458.42679"
-   y1="55.8867"
-   x1="458.42679"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_6_">
-		<stop
-   id="stop296"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop298"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22131"
-   x2="413.16309"
-   y1="55.888199"
-   x1="413.16309"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_7_">
-		<stop
-   id="stop303"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop305"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="290.76169"
-   y1="55.8867"
-   x1="290.76169"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_8_">
-		<stop
-   id="stop310"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop312"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22119"
-   x2="346.77341"
-   y1="55.888199"
-   x1="346.77341"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_9_">
-		<stop
-   id="stop317"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop319"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-<linearGradient
-   y2="18.967093"
-   x2="-2.4040222"
-   y1="4.4573336"
-   x1="-2.4040222"
-   gradientTransform="translate(13.927091,16.573387)"
-   gradientUnits="userSpaceOnUse"
-   id="linearGradient3475"
-   xlink:href="#linearGradient3587-6-5-26"
-   inkscape:collect="always" /><linearGradient
-   id="linearGradient3587-6-5-26"><stop
-     id="stop3589-9-2-45"
-     style="stop-color:#000000;stop-opacity:1"
-     offset="0" /><stop
-     id="stop3591-7-4-20"
-     style="stop-color:#363636;stop-opacity:1"
-     offset="1" /></linearGradient><filter
-   inkscape:collect="always"
-   id="filter4274"
-   x="-0.075768784"
-   width="1.1515376"
-   y="-0.14014855"
-   height="1.2802971"><feGaussianBlur
-     inkscape:collect="always"
-     stdDeviation="0.94710989"
-     id="feGaussianBlur4276" /></filter></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1280"
-   inkscape:window-height="774"
-   id="namedview323"
-   showgrid="false"
-   inkscape:zoom="8"
-   inkscape:cx="-8.6923201"
-   inkscape:cy="19.488907"
-   inkscape:window-x="0"
-   inkscape:window-y="26"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   units="px"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-<pattern
-   y="565.223"
-   width="69"
-   height="69"
-   patternUnits="userSpaceOnUse"
-   id="Polka_Dot_Pattern"
-   viewBox="2.125 -70.896 69 69"
-   overflow="visible">
-	<g
-   id="g4">
-		<polygon
-   fill="none"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon6" />
-		<polygon
-   fill="#F6BB60"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon8" />
-		<g
-   id="g10">
-			<path
-   fill="#FFFFFF"
-   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path12" />
-			<path
-   fill="#FFFFFF"
-   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path14" />
-			<path
-   fill="#FFFFFF"
-   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path16" />
-			<path
-   fill="#FFFFFF"
-   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path18" />
-			<path
-   fill="#FFFFFF"
-   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path20" />
-			<path
-   fill="#FFFFFF"
-   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path22" />
-			<path
-   fill="#FFFFFF"
-   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path24" />
-			<path
-   fill="#FFFFFF"
-   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path26" />
-			<path
-   fill="#FFFFFF"
-   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path28" />
-		</g>
-		<g
-   id="g30">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path32" />
-		</g>
-		<path
-   fill="#FFFFFF"
-   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path34" />
-		<g
-   id="g36">
-			<g
-   id="g38">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path40" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path42" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path44" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path46" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path48" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path50" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path52" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path54" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path56" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path58" />
-			</g>
-			<g
-   id="g60">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path62" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path64" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path66" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path68" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path70" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path72" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path74" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path76" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path78" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path80" />
-			</g>
-			<g
-   id="g82">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path84" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path86" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path88" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path90" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path92" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path94" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path96" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path98" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path100" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path102" />
-			</g>
-			<g
-   id="g104">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path106" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path108" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path110" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path112" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path114" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path116" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path118" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path120" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
-   id="path122" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path124" />
-			</g>
-			<g
-   id="g126">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path128" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path130" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path132" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path134" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path136" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path138" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path140" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path142" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path144" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path146" />
-			</g>
-			<g
-   id="g148">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path150" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path152" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path154" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path156" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path158" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path160" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path162" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path164" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path166" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path168" />
-			</g>
-			<g
-   id="g170">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path172" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path174" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path176" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path178" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path180" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path182" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path184" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path186" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path188" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path190" />
-			</g>
-			<g
-   id="g192">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path194" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path196" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path198" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path200" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path202" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path204" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path206" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path208" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path210" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path212" />
-			</g>
-		</g>
-		<g
-   id="g214">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path216" />
-			<path
-   fill="#FFFFFF"
-   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path218" />
-			<path
-   fill="#FFFFFF"
-   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path220" />
-			<path
-   fill="#FFFFFF"
-   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path222" />
-			<path
-   fill="#FFFFFF"
-   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path224" />
-			<path
-   fill="#FFFFFF"
-   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path226" />
-			<path
-   fill="#FFFFFF"
-   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path228" />
-			<path
-   fill="#FFFFFF"
-   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
-   id="path230" />
-			<path
-   fill="#FFFFFF"
-   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
-   id="path232" />
-			<path
-   fill="#FFFFFF"
-   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
-   id="path234" />
-		</g>
-	</g>
-</pattern>
-
-<rect
-   style="fill:#1d2d44;fill-opacity:1"
-   id="rect7667"
-   width="32"
-   height="32"
-   x="0"
-   y="-5.2587893e-06"
-   rx="5"
-   ry="5" /><path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-   d="m 14.58312,7.280992 c -2.232936,0 -4.036942,1.80401 -4.036942,4.03694 0,0.92043 0.306488,1.76756 0.823221,2.44591 1.120977,-1.29745 2.775437,-2.12137 4.622692,-2.12137 0.903762,0 1.760771,0.20125 2.532985,0.55409 0.06252,-0.28275 0.09499,-0.57681 0.09499,-0.87863 0,-2.23293 -1.804003,-4.03694 -4.036941,-4.03694 z m -5.27177,1.86808 c -1.162852,0 -2.097627,0.94269 -2.097627,2.10554 0,0.3765 0.09713,0.73224 0.269128,1.03694 0.70171,-0.39584 1.512966,-0.62533 2.374672,-0.62533 0.08316,0 0.163259,0.003 0.245384,0.008 -0.0093,-0.11788 -0.01582,-0.23595 -0.01582,-0.3562 0,-0.64768 0.140672,-1.26392 0.387863,-1.82058 -0.33282,-0.22318 -0.731572,-0.34828 -1.163589,-0.34828 z m 9.95779,1.44855 c -0.08591,0 -0.168718,0.0105 -0.253299,0.0158 0.03659,0.23068 0.06332,0.46361 0.06332,0.70449 0,0.37486 -0.04767,0.73658 -0.134564,1.08443 1.018734,0.56378 1.864755,1.40734 2.422165,2.43008 0.578161,-0.301 1.223119,-0.49238 1.907654,-0.53826 -0.176419,-2.06894 -1.890444,-3.69657 -4.00528,-3.69657 z m -3.277049,1.50396 c -3.124547,0 -5.651718,2.52695 -5.651718,5.65171 0,3.12442 2.527042,5.65172 5.651718,5.65172 3.124679,0 5.65172,-2.5273 5.65172,-5.65172 0,-3.12475 -2.52717,-5.65171 -5.65172,-5.65171 z m -6.134568,0.0237 c -2.424056,0 -4.385225,1.96117 -4.385225,4.38523 0,1.42699 0.679906,2.69025 1.73351,3.49076 0.444179,-0.85669 1.33629,-1.44063 2.366755,-1.44063 0.124542,0 0.244083,0.0151 0.364116,0.0317 -0.03768,-0.27414 -0.05541,-0.55461 -0.05541,-0.83905 0,-1.35993 0.442668,-2.61752 1.195249,-3.63324 -0.450488,-0.56371 -0.772875,-1.24102 -0.910292,-1.9789 -0.101843,-0.007 -0.205054,-0.0158 -0.308706,-0.0158 z m 13.741433,2.61214 c -0.736055,0 -1.425548,0.18792 -2.034303,0.5066 0.345671,0.76568 0.538259,1.61522 0.538259,2.50923 0,1.67396 -0.673022,3.19393 -1.765172,4.29815 0.802331,0.89076 1.966418,1.44855 3.261216,1.44855 2.424057,0 4.385229,-1.96116 4.385229,-4.38522 0,-2.42406 -1.961172,-4.37731 -4.385229,-4.37731 z m -18.5541,0.57788 C 2.811855,15.315302 1,17.111322 1,19.344322 c 0,2.233 1.811855,4.04486 4.044856,4.04486 0.849912,0 1.637225,-0.2648 2.287602,-0.7124 -0.268749,-0.41761 -0.427442,-0.91688 -0.427442,-1.44855 0,-0.27596 0.04072,-0.54107 0.118732,-0.79156 -1.217569,-0.87992 -2.010555,-2.31182 -2.010555,-3.92612 0,-0.41016 0.05405,-0.80676 0.150398,-1.18734 -0.03999,-10e-4 -0.07845,-0.008 -0.118735,-0.008 z m 23.738799,3.46702 c -0.119122,0 -0.23439,0.0136 -0.348285,0.0317 0.0063,0.10069 0.0079,0.19852 0.0079,0.30079 0,1.28753 -0.508015,2.45614 -1.329815,3.32454 0.404298,0.47015 0.998155,0.76781 1.670188,0.76781 1.224112,0 2.21636,-0.98433 2.21636,-2.20845 0,-1.22411 -0.992248,-2.21635 -2.21636,-2.21635 z m -19.211092,0.23746 c -1.22405,0 -2.208444,0.9844 -2.208444,2.20845 0,1.22404 0.984394,2.21636 2.208444,2.21636 0.93825,0 1.73464,-0.58546 2.05805,-1.40898 -0.789132,-0.80372 -1.35627,-1.82906 -1.606861,-2.96833 -0.146642,-0.0303 -0.295484,-0.0475 -0.451189,-0.0475 z"
-   id="circle238"
-   inkscape:export-filename="/home/user/owncloud/core/img/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   inkscape:connector-curvature="0"
-   sodipodi:nodetypes="sscscsscscscscccscscccsssssssscscsccsscscssscsscscsccccscssccsssccs" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
+<svg xml:space="preserve" height="32" viewBox="0 0 32 31.999997" xmlns:dc="http://purl.org/dc/elements/1.1/" width="32" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111">
+<rect rx="5" ry="5" height="32" width="32" y="-.0000052588" x="0" fill="#1d2d44"/><path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m14.583 7.281c-2.2329 0-4.0369 1.804-4.0369 4.0369 0 0.92043 0.30649 1.7676 0.82322 2.4459 1.121-1.2974 2.7754-2.1214 4.6227-2.1214 0.90376 0 1.7608 0.20125 2.533 0.55409 0.06252-0.28275 0.09499-0.57681 0.09499-0.87863 0-2.2329-1.804-4.0369-4.0369-4.0369zm-5.2718 1.8681c-1.1629 0-2.0976 0.94269-2.0976 2.1055 0 0.3765 0.09713 0.73224 0.26913 1.0369 0.70171-0.39584 1.513-0.62533 2.3747-0.62533 0.08316 0 0.16326 0.003 0.24538 0.008-0.0093-0.11788-0.01582-0.23595-0.01582-0.3562 0-0.64768 0.14067-1.2639 0.38786-1.8206-0.33282-0.22318-0.73157-0.34828-1.1636-0.34828zm9.9578 1.4486c-0.08591 0-0.16872 0.0105-0.2533 0.0158 0.03659 0.23068 0.06332 0.46361 0.06332 0.70449 0 0.37486-0.04767 0.73658-0.13456 1.0844 1.0187 0.56378 1.8648 1.4073 2.4222 2.4301 0.57816-0.301 1.2231-0.49238 1.9077-0.53826-0.17642-2.0689-1.8904-3.6966-4.0053-3.6966zm-3.277 1.504c-3.1245 0-5.6517 2.527-5.6517 5.6517 0 3.1244 2.527 5.6517 5.6517 5.6517s5.6517-2.5273 5.6517-5.6517c0-3.1248-2.5272-5.6517-5.6517-5.6517zm-6.1346 0.0237c-2.4241 0-4.3852 1.9612-4.3852 4.3852 0 1.427 0.67991 2.6902 1.7335 3.4908 0.44418-0.85669 1.3363-1.4406 2.3668-1.4406 0.12454 0 0.24408 0.0151 0.36412 0.0317-0.03768-0.27414-0.05541-0.55461-0.05541-0.83905 0-1.3599 0.44267-2.6175 1.1952-3.6332-0.45049-0.56371-0.77288-1.241-0.91029-1.9789-0.10184-0.007-0.20505-0.0158-0.30871-0.0158zm13.741 2.6121c-0.73606 0-1.4255 0.18792-2.0343 0.5066 0.34567 0.76568 0.53826 1.6152 0.53826 2.5092 0 1.674-0.67302 3.1939-1.7652 4.2982 0.80233 0.89076 1.9664 1.4486 3.2612 1.4486 2.4241 0 4.3852-1.9612 4.3852-4.3852 0-2.4241-1.9612-4.3773-4.3852-4.3773zm-18.554 0.57788c-2.2321-0.001-4.044 1.795-4.044 4.028s1.8119 4.0449 4.0449 4.0449c0.84991 0 1.6372-0.2648 2.2876-0.7124-0.26875-0.41761-0.42744-0.91688-0.42744-1.4486 0-0.27596 0.04072-0.54107 0.11873-0.79156-1.2176-0.87992-2.0106-2.3118-2.0106-3.9261 0-0.41016 0.05405-0.80676 0.1504-1.1873-0.03999-0.001-0.07845-0.008-0.11874-0.008zm23.739 3.467c-0.11912 0-0.23439 0.0136-0.34828 0.0317 0.0063 0.10069 0.0079 0.19852 0.0079 0.30079 0 1.2875-0.50802 2.4561-1.3298 3.3245 0.4043 0.47015 0.99816 0.76781 1.6702 0.76781 1.2241 0 2.2164-0.98433 2.2164-2.2084s-0.99225-2.2164-2.2164-2.2164zm-19.211 0.23746c-1.224 0-2.2084 0.9844-2.2084 2.2084s0.98439 2.2164 2.2084 2.2164c0.93825 0 1.7346-0.58546 2.058-1.409-0.78913-0.80372-1.3563-1.8291-1.6069-2.9683-0.14664-0.0303-0.29548-0.0475-0.45119-0.0475z" fill="#fff"/>
+</svg>
diff --git a/core/img/filetypes/application-x-debian-package.png b/core/img/filetypes/application-x-debian-package.png
index b3f6b7e5cf91efbb0d6ccf4062620c970f327ee3..1d6db5f933a4adcdc492dd91c4c75017005f4fcf 100644
Binary files a/core/img/filetypes/application-x-debian-package.png and b/core/img/filetypes/application-x-debian-package.png differ
diff --git a/core/img/googleplay.png b/core/img/googleplay.png
index 2d9ad6296080509464d3d412c8b3e93254626c3f..1470518272e729acce679bd8b05d24c128492dc6 100644
Binary files a/core/img/googleplay.png and b/core/img/googleplay.png differ
diff --git a/core/img/image-optimization.sh b/core/img/image-optimization.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0a96bf558d1c809c2ffc653a0d8c21c8b583c770
--- /dev/null
+++ b/core/img/image-optimization.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+function recursive_optimize_images() {
+cd $1;
+optipng -o6 *.png;
+jpegoptim --strip-all *.jpg;
+for svg in `ls *.svg`;
+do
+    mv $svg $svg.opttmp;
+    scour -i $svg.opttmp -o $svg --create-groups --enable-id-stripping --enable-comment-stripping --shorten-ids --remove-metadata;
+done;
+rm *.opttmp
+for dir in `ls -d */`;
+do
+    recursive_optimize_images $dir;
+    cd ..;
+done;
+}
+
+recursive_optimize_images ../../
diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png
index b0c90984e44bb4b8244339c62c609749f7db6db5..5b7d4c6f915fee2bf95c9ce7b903baf30b6c006b 100644
Binary files a/core/img/logo-wide.png and b/core/img/logo-wide.png differ
diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg
index cf8eace5204242c4ddd230f1c268cd5f0dd327a6..29c617d6f83e18df20cfd1bef593cd8483cf0924 100644
--- a/core/img/logo-wide.svg
+++ b/core/img/logo-wide.svg
@@ -1,796 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="147.33263"
-   height="32"
-   viewBox="0 0 147.33262 32"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="logo-wide.svg"
-   inkscape:export-filename="logo-wide.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><metadata
-   id="metadata327"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs325"><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_1_"
-   id="linearGradient3353"
-   gradientUnits="userSpaceOnUse"
-   x1="288.49411"
-   y1="55.888199"
-   x2="288.49411"
-   y2="339.22189" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_2_"
-   id="linearGradient3355"
-   gradientUnits="userSpaceOnUse"
-   x1="251.2114"
-   y1="55.888199"
-   x2="251.2114"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_3_"
-   id="linearGradient3357"
-   gradientUnits="userSpaceOnUse"
-   x1="293.22461"
-   y1="55.888199"
-   x2="293.22461"
-   y2="339.22171" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_4_"
-   id="linearGradient3359"
-   gradientUnits="userSpaceOnUse"
-   x1="375.33401"
-   y1="55.888199"
-   x2="375.33401"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_5_"
-   id="linearGradient3361"
-   gradientUnits="userSpaceOnUse"
-   x1="334.49411"
-   y1="55.888199"
-   x2="334.49411"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_6_"
-   id="linearGradient3363"
-   gradientUnits="userSpaceOnUse"
-   x1="458.42679"
-   y1="55.8867"
-   x2="458.42679"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_7_"
-   id="linearGradient3365"
-   gradientUnits="userSpaceOnUse"
-   x1="413.16309"
-   y1="55.888199"
-   x2="413.16309"
-   y2="339.22131" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_8_"
-   id="linearGradient3367"
-   gradientUnits="userSpaceOnUse"
-   x1="290.76169"
-   y1="55.8867"
-   x2="290.76169"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_9_"
-   id="linearGradient3369"
-   gradientUnits="userSpaceOnUse"
-   x1="346.77341"
-   y1="55.888199"
-   x2="346.77341"
-   y2="339.22119" />
-	<linearGradient
-   y2="339.22189"
-   x2="288.49411"
-   y1="55.888199"
-   x1="288.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop261"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop263"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="251.2114"
-   y1="55.888199"
-   x1="251.2114"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop268"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop270"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22171"
-   x2="293.22461"
-   y1="55.888199"
-   x1="293.22461"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop275"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop277"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="375.33401"
-   y1="55.888199"
-   x1="375.33401"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_4_">
-		<stop
-   id="stop282"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop284"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="334.49411"
-   y1="55.888199"
-   x1="334.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_5_">
-		<stop
-   id="stop289"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop291"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="458.42679"
-   y1="55.8867"
-   x1="458.42679"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_6_">
-		<stop
-   id="stop296"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop298"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22131"
-   x2="413.16309"
-   y1="55.888199"
-   x1="413.16309"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_7_">
-		<stop
-   id="stop303"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop305"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="290.76169"
-   y1="55.8867"
-   x1="290.76169"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_8_">
-		<stop
-   id="stop310"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop312"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22119"
-   x2="346.77341"
-   y1="55.888199"
-   x1="346.77341"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_9_">
-		<stop
-   id="stop317"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop319"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1280"
-   inkscape:window-height="773"
-   id="namedview323"
-   showgrid="true"
-   inkscape:zoom="2.8284271"
-   inkscape:cx="74.404008"
-   inkscape:cy="18.870615"
-   inkscape:window-x="0"
-   inkscape:window-y="-1"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   showguides="true"
-   inkscape:guide-bbox="true"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"><inkscape:grid
-     type="xygrid"
-     id="grid3149"
-     empspacing="4"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
-<pattern
-   y="565.223"
-   width="69"
-   height="69"
-   patternUnits="userSpaceOnUse"
-   id="Polka_Dot_Pattern"
-   viewBox="2.125 -70.896 69 69"
-   overflow="visible">
-	<g
-   id="g4">
-		<polygon
-   fill="none"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon6" />
-		<polygon
-   fill="#F6BB60"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon8" />
-		<g
-   id="g10">
-			<path
-   fill="#FFFFFF"
-   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path12" />
-			<path
-   fill="#FFFFFF"
-   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path14" />
-			<path
-   fill="#FFFFFF"
-   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path16" />
-			<path
-   fill="#FFFFFF"
-   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path18" />
-			<path
-   fill="#FFFFFF"
-   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path20" />
-			<path
-   fill="#FFFFFF"
-   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path22" />
-			<path
-   fill="#FFFFFF"
-   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path24" />
-			<path
-   fill="#FFFFFF"
-   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path26" />
-			<path
-   fill="#FFFFFF"
-   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path28" />
-		</g>
-		<g
-   id="g30">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path32" />
-		</g>
-		<path
-   fill="#FFFFFF"
-   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path34" />
-		<g
-   id="g36">
-			<g
-   id="g38">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path40" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path42" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path44" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path46" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path48" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path50" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path52" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path54" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path56" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path58" />
-			</g>
-			<g
-   id="g60">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path62" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path64" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path66" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path68" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path70" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path72" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path74" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path76" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path78" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path80" />
-			</g>
-			<g
-   id="g82">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path84" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path86" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path88" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path90" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path92" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path94" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path96" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path98" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path100" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path102" />
-			</g>
-			<g
-   id="g104">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path106" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path108" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path110" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path112" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path114" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path116" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path118" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path120" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
-   id="path122" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path124" />
-			</g>
-			<g
-   id="g126">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path128" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path130" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path132" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path134" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path136" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path138" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path140" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path142" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path144" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path146" />
-			</g>
-			<g
-   id="g148">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path150" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path152" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path154" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path156" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path158" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path160" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path162" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path164" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path166" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path168" />
-			</g>
-			<g
-   id="g170">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path172" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path174" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path176" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path178" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path180" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path182" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path184" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path186" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path188" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path190" />
-			</g>
-			<g
-   id="g192">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path194" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path196" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path198" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path200" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path202" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path204" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path206" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path208" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path210" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path212" />
-			</g>
-		</g>
-		<g
-   id="g214">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path216" />
-			<path
-   fill="#FFFFFF"
-   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path218" />
-			<path
-   fill="#FFFFFF"
-   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path220" />
-			<path
-   fill="#FFFFFF"
-   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path222" />
-			<path
-   fill="#FFFFFF"
-   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path224" />
-			<path
-   fill="#FFFFFF"
-   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path226" />
-			<path
-   fill="#FFFFFF"
-   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path228" />
-			<path
-   fill="#FFFFFF"
-   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
-   id="path230" />
-			<path
-   fill="#FFFFFF"
-   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
-   id="path232" />
-			<path
-   fill="#FFFFFF"
-   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
-   id="path234" />
-		</g>
-	</g>
-</pattern>
-
-
-
-
-
-
-
-
-
-
-
-
-<path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-   d="M 104 13 L 104 28.34375 C 104 30.351679 105.7108 32 107.71875 32 L 107.71875 31 C 106.1994 31 105.00005 29.863098 105 28.34375 L 105 13 L 104 13 z M 146 13 L 146 21 L 141.46875 21 C 138.47749 21 136 23.571216 136 26.5625 C 136 29.55333 138.47761 32.027578 141.46875 32 L 143.25 32 C 144.12752 32 144.98935 31.557662 145.6875 30.90625 C 146.38564 30.254838 146.9816 29.351228 147 28.34375 L 147 13 L 146 13 z M 101.5 15 C 96.864928 15 93 18.864659 93 23.5 C 93 28.135341 96.864963 32 101.5 32 L 101.5 31 C 97.353634 31 94 27.64657 94 23.5 C 94 19.35343 97.353659 16 101.5 16 L 101.5 15 z M 55.5 21 C 54.894287 21 54.299303 21.092367 53.75 21.28125 C 53.820997 21.606183 53.900137 21.944789 53.9375 22.28125 C 54.426854 22.100793 54.944546 22 55.5 22 C 58.00269 22 60 23.997307 60 26.5 C 60 29.002698 58.00269 31 55.5 31 C 54.05604 31 52.789695 30.324452 51.96875 29.28125 C 51.770697 29.536182 51.534658 29.766418 51.3125 30 C 52.329062 31.207716 53.832794 32 55.5 32 C 58.49143 32 61 29.49143 61 26.5 C 61 23.508576 58.49143 21 55.5 21 z M 63 21 L 63 28.34375 C 63.000084 30.351759 64.992445 32 67 32 C 68.368297 32 69.905251 31.305044 70.53125 30.1875 C 71.152707 31.305044 72.631958 32 74 32 C 76.007944 32 78 30.351759 78 28.34375 L 78 21 L 77 21 L 77 28.34375 C 77.000063 29.863018 75.519353 31 74 31 C 72.480637 31 71.000069 29.997995 71 28.34375 L 71 21 L 70 21 L 70 28.34375 C 70.000063 29.863098 68.519868 31 67 31 C 65.481152 31 64.000063 29.863018 64 28.34375 L 64 21 L 63 21 z M 85.53125 21 C 82.53999 21 80 23.539966 80 26.53125 L 80 32 L 81 32 L 81 26.53125 C 81 24.028717 83.028747 22 85.53125 22 C 88.034238 22 90 24.028717 90 26.53125 L 90 32 L 91 32 L 91 26.53125 C 91 23.539966 88.522913 21 85.53125 21 z M 115.5 21 C 112.50857 21 110 23.508576 110 26.5 C 110 29.491429 112.50857 32 115.5 32 C 118.49142 32 121 29.491429 121 26.5 C 121 23.508576 118.49142 21 115.5 21 z M 123 21 L 123 26.5625 C 123 29.553329 125.47749 32 128.46875 32 C 131.46 32 134 29.553379 134 26.5625 L 134 21 L 133 21 L 133 26.5625 C 133 29.064438 130.97124 31 128.46875 31 C 125.96625 31 124 29.064488 124 26.5625 L 124 21 L 123 21 z M 115.5 22 C 118.00269 22 120 23.997307 120 26.5 C 120 29.002698 118.00269 31 115.5 31 C 112.9973 31 111 29.002698 111 26.5 C 111 23.997307 112.9973 22 115.5 22 z M 141.46875 22 L 146 22 L 146 28.34375 C 145.9872 29.043638 145.64973 29.731233 145.09375 30.25 C 144.53777 30.768767 143.81736 31 143.25 31 L 141.46875 31 C 138.96626 31 137 29.064488 137 26.5625 C 137 24.059967 138.96626 22 141.46875 22 z "
-   transform="translate(-3.1713867e-6,0)"
-   id="path4576" /><path
-   id="path4645"
-   d="m 16.398236,3.6857007 c -2.294299,0 -4.138603,1.8599193 -4.138603,4.1542214 0,0.7428272 0.191646,1.444716 0.53099,2.0458759 1.384469,-0.7809966 2.985072,-1.2337725 4.685212,-1.2337725 0.164075,0 0.322108,0.00666 0.484139,0.015617 -0.01834,-0.2325805 -0.03123,-0.4655392 -0.03123,-0.7027818 0,-1.277873 0.27755,-2.4937113 0.765251,-3.5919959 C 18.037341,3.9325357 17.250605,3.6857007 16.398236,3.6857007 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4647"
-   d="m 7.9804722,15.851635 c -4.4056985,0 -7.9804773346191,3.543546 -7.9804773346191,7.949243 0,4.405698 3.5747788346191,7.980478 7.9804773346191,7.980478 1.6768711,0 3.2302328,-0.522455 4.5134208,-1.405564 -0.530236,-0.823928 -0.843338,-1.808982 -0.843338,-2.857979 0,-0.54446 0.08034,-1.067529 0.234261,-1.561738 -2.4022573,-1.736077 -3.9668133,-4.561215 -3.9668133,-7.746217 0,-0.809239 0.1066379,-1.591735 0.2967301,-2.342606 -0.078902,-0.0023 -0.1547894,-0.01562 -0.2342606,-0.01562 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4649"
-   d="m 17.475835,9.5578332 c -4.782649,0 -8.6520246,3.8693738 -8.6520246,8.6520248 0,2.815446 1.3414496,5.307847 3.4202046,6.887262 0.876362,-1.690252 2.636493,-2.842362 4.669595,-2.842362 0.24572,0 0.481575,0.02978 0.718399,0.06247 -0.07434,-0.540881 -0.109322,-1.094255 -0.109322,-1.655441 0,-2.683145 0.873389,-5.164355 2.358224,-7.168375 C 18.9921,12.381225 18.35603,11.044884 18.084913,9.5890679 17.883976,9.5751497 17.68034,9.5578332 17.475835,9.5578332 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4651"
-   d="m 36.044892,6.5436801 c -0.169497,0 -0.332877,0.02081 -0.499756,0.031235 0.07218,0.4551333 0.124939,0.9147028 0.124939,1.3899463 0,0.7396048 -0.09406,1.4532833 -0.265495,2.1395799 2.009958,1.11234 3.679148,2.776673 4.778916,4.794534 1.140713,-0.593858 2.413207,-0.971466 3.763787,-1.061982 -0.34807,-4.0820006 -3.729828,-7.2933129 -7.902391,-7.2933129 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4653"
-   d="m 26.799407,5.1362321e-7 c -4.405568,0 -7.96486,3.55928898637679 -7.96486,7.96486058637679 0,1.8159896 0.604694,3.4873779 1.624207,4.8257679 2.21168,-2.559867 5.47592,-4.1854556 9.120546,-4.1854556 1.783114,0 3.473988,0.3970656 4.997559,1.0932161 C 34.700214,9.1405309 34.764268,8.5603418 34.764268,7.9648611 34.764268,3.5592895 31.204981,5.1362321e-7 26.799407,5.1362321e-7 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4657"
-   d="m 44.587596,14.711566 c -1.452231,0 -2.812602,0.370759 -4.013665,0.999512 0.682002,1.510683 1.061981,3.186835 1.061981,4.950708 0,3.302705 -1.327872,6.301597 -3.482674,8.480233 1.582992,1.757452 3.879725,2.85798 6.434358,2.85798 4.782649,0 8.652024,-3.869376 8.652024,-8.652025 0,-4.782652 -3.869375,-8.636408 -8.652024,-8.636408 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4659"
-   d="m 16.91361,23.160565 c -2.415041,0 -4.357247,1.942205 -4.357247,4.357248 0,2.41504 1.942206,4.372864 4.357247,4.372864 1.851161,0 3.422433,-1.155096 4.060517,-2.779892 -1.55695,-1.585736 -2.675908,-3.608729 -3.170327,-5.856515 -0.289324,-0.05983 -0.582985,-0.09371 -0.89019,-0.09371 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /><path
-   id="path4661"
-   d="m 29.5793,9.510981 c -6.164715,0 -11.150805,4.985676 -11.150805,11.150805 0,6.164464 4.985835,11.150804 11.150805,11.150804 6.164969,0 11.150804,-4.98635 11.150804,-11.150804 0,-6.165118 -4.98609,-11.150805 -11.150804,-11.150805 z"
-   style="fill:#ffffff;fill-opacity:1;stroke:none"
-   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
+<svg xml:space="preserve" height="32" viewBox="0 0 147.33262 32" xmlns:dc="http://purl.org/dc/elements/1.1/" width="147.33" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111"><g fill="#fff">
+<path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m104 13v15.344c0 2.008 1.71 3.656 3.72 3.656v-1c-1.52 0-2.72-1.137-2.72-2.656v-15.344h-1zm42 0v8h-4.53c-2.99 0-5.47 2.571-5.47 5.562s2.48 5.466 5.47 5.438h1.78c0.88 0 1.74-0.442 2.44-1.094 0.7-0.651 1.29-1.555 1.31-2.562v-15.344h-1zm-44.5 2c-4.635 0-8.5 3.865-8.5 8.5s3.865 8.5 8.5 8.5v-1c-4.146 0-7.5-3.353-7.5-7.5s3.354-7.5 7.5-7.5v-1zm-46 6c-0.606 0-1.201 0.092-1.75 0.281 0.071 0.325 0.15 0.664 0.188 1 0.489-0.18 1.007-0.281 1.562-0.281 2.503 0 4.5 1.997 4.5 4.5s-1.997 4.5-4.5 4.5c-1.444 0-2.71-0.676-3.531-1.719-0.198 0.255-0.434 0.485-0.657 0.719 1.017 1.208 2.521 2 4.188 2 2.991 0 5.5-2.509 5.5-5.5s-2.509-5.5-5.5-5.5zm7.5 0v7.344c0 2.008 1.992 3.656 4 3.656 1.368 0 2.905-0.695 3.531-1.812 0.622 1.117 2.101 1.812 3.469 1.812 2.008 0 4-1.648 4-3.656v-7.344h-1v7.344c0 1.519-1.481 2.656-3 2.656s-3-1.002-3-2.656v-7.344h-1v7.344c0 1.519-1.48 2.656-3 2.656-1.519 0-3-1.137-3-2.656v-7.344h-1zm22.531 0c-2.991 0-5.531 2.54-5.531 5.531v5.469h1v-5.469c0-2.502 2.029-4.531 4.531-4.531 2.503 0 4.469 2.029 4.469 4.531v5.469h1v-5.469c0-2.991-2.477-5.531-5.469-5.531zm29.969 0c-2.99 0-5.5 2.509-5.5 5.5s2.51 5.5 5.5 5.5 5.5-2.509 5.5-5.5-2.51-5.5-5.5-5.5zm7.5 0v5.562c0 2.991 2.48 5.438 5.47 5.438s5.53-2.447 5.53-5.438v-5.562h-1v5.562c0 2.502-2.03 4.438-4.53 4.438s-4.47-1.936-4.47-4.438v-5.562h-1zm-7.5 1c2.5 0 4.5 1.997 4.5 4.5s-2 4.5-4.5 4.5-4.5-1.997-4.5-4.5 2-4.5 4.5-4.5zm25.97 0h4.53v6.344c-0.01 0.7-0.35 1.387-0.91 1.906-0.55 0.519-1.27 0.75-1.84 0.75h-1.78c-2.5 0-4.47-1.936-4.47-4.438s1.97-4.562 4.47-4.562z" transform="translate(-.0000031714)"/><path d="m16.398 3.6857c-2.2943 0-4.1386 1.8599-4.1386 4.1542 0 0.74283 0.19165 1.4447 0.53099 2.0459 1.3845-0.781 2.9851-1.2338 4.6852-1.2338 0.16408 0 0.32211 0.00666 0.48414 0.015617-0.01834-0.23258-0.03123-0.46554-0.03123-0.70278 0-1.2779 0.27755-2.4937 0.76525-3.592-0.657-0.4403-1.443-0.6871-2.296-0.6871z"/><path d="m7.9805 15.852c-4.4057 0-7.9805 3.5435-7.9805 7.9492s3.5748 7.9805 7.9805 7.9805c1.6769 0 3.2302-0.52246 4.5134-1.4056-0.53024-0.82393-0.84334-1.809-0.84334-2.858 0-0.54446 0.08034-1.0675 0.23426-1.5617-2.4023-1.7361-3.9668-4.5612-3.9668-7.7462 0-0.80924 0.10664-1.5917 0.29673-2.3426-0.078902-0.0023-0.15479-0.01562-0.23426-0.01562z"/><path d="m17.476 9.5578c-4.7826 0-8.652 3.8694-8.652 8.652 0 2.8154 1.3414 5.3078 3.4202 6.8873 0.87636-1.6903 2.6365-2.8424 4.6696-2.8424 0.24572 0 0.48158 0.02978 0.7184 0.06247-0.07434-0.54088-0.10932-1.0943-0.10932-1.6554 0-2.6831 0.87339-5.1644 2.3582-7.1684-0.889-1.112-1.525-2.448-1.796-3.9039-0.201-0.014-0.405-0.0313-0.609-0.0313z"/><path d="m36.045 6.5437c-0.1695 0-0.33288 0.02081-0.49976 0.031235 0.07218 0.45513 0.12494 0.9147 0.12494 1.3899 0 0.7396-0.09406 1.4533-0.2655 2.1396 2.01 1.1123 3.6791 2.7767 4.7789 4.7945 1.1407-0.59386 2.4132-0.97147 3.7638-1.062-0.34807-4.082-3.7298-7.2933-7.9024-7.2933z"/><path d="m26.799 5.1362e-7c-4.4056 0-7.9649 3.5593-7.9649 7.9649 0 1.816 0.60469 3.4874 1.6242 4.8258 2.2117-2.5599 5.4759-4.1855 9.1205-4.1855 1.7831 0 3.474 0.39707 4.9976 1.0932 0.124-0.5582 0.188-1.1384 0.188-1.7338 0-4.4056-3.559-7.9649-7.965-7.9649z"/><path d="m44.588 14.712c-1.4522 0-2.8126 0.37076-4.0137 0.99951 0.682 1.5107 1.062 3.1868 1.062 4.9507 0 3.3027-1.3279 6.3016-3.4827 8.4802 1.583 1.7575 3.8797 2.858 6.4344 2.858 4.7826 0 8.652-3.8694 8.652-8.652 0-4.7827-3.8694-8.6364-8.652-8.6364z"/><path d="m16.914 23.161c-2.415 0-4.3572 1.9422-4.3572 4.3572s1.9422 4.3729 4.3572 4.3729c1.8512 0 3.4224-1.1551 4.0605-2.7799-1.557-1.5857-2.6759-3.6087-3.1703-5.8565-0.28932-0.05983-0.58298-0.09371-0.89019-0.09371z"/><path d="m29.579 9.511c-6.1647 0-11.151 4.9857-11.151 11.151 0 6.1645 4.9858 11.151 11.151 11.151 6.165 0 11.151-4.9864 11.151-11.151 0-6.1651-4.9861-11.151-11.151-11.151z"/></g></svg>
diff --git a/core/img/logo.png b/core/img/logo.png
index a84fe145bbdc5aab34b353dc8bb3163fd54badbe..8d112d99be554002b6fcab41b6468d27e75954b0 100644
Binary files a/core/img/logo.png and b/core/img/logo.png differ
diff --git a/core/img/logo.svg b/core/img/logo.svg
index bd928cccfa28ed2db23d536fee53f87d818341ca..cfb20b60e4f3c2dffb48c1b00131498e6c5444c1 100644
--- a/core/img/logo.svg
+++ b/core/img/logo.svg
@@ -1,759 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="250.00002"
-   height="118.22803"
-   viewBox="0 0 250.00001 118.22802"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="logo-inverted.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/logo-sticker.png"
-   inkscape:export-xdpi="300.00223"
-   inkscape:export-ydpi="300.00223"><metadata
-   id="metadata327"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs325"><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_1_"
-   id="linearGradient3353"
-   gradientUnits="userSpaceOnUse"
-   x1="288.49411"
-   y1="55.888199"
-   x2="288.49411"
-   y2="339.22189" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_2_"
-   id="linearGradient3355"
-   gradientUnits="userSpaceOnUse"
-   x1="251.2114"
-   y1="55.888199"
-   x2="251.2114"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_3_"
-   id="linearGradient3357"
-   gradientUnits="userSpaceOnUse"
-   x1="293.22461"
-   y1="55.888199"
-   x2="293.22461"
-   y2="339.22171" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_4_"
-   id="linearGradient3359"
-   gradientUnits="userSpaceOnUse"
-   x1="375.33401"
-   y1="55.888199"
-   x2="375.33401"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_5_"
-   id="linearGradient3361"
-   gradientUnits="userSpaceOnUse"
-   x1="334.49411"
-   y1="55.888199"
-   x2="334.49411"
-   y2="339.22159" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_6_"
-   id="linearGradient3363"
-   gradientUnits="userSpaceOnUse"
-   x1="458.42679"
-   y1="55.8867"
-   x2="458.42679"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_7_"
-   id="linearGradient3365"
-   gradientUnits="userSpaceOnUse"
-   x1="413.16309"
-   y1="55.888199"
-   x2="413.16309"
-   y2="339.22131" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_8_"
-   id="linearGradient3367"
-   gradientUnits="userSpaceOnUse"
-   x1="290.76169"
-   y1="55.8867"
-   x2="290.76169"
-   y2="339.2236" /><linearGradient
-   inkscape:collect="always"
-   xlink:href="#SVGID_9_"
-   id="linearGradient3369"
-   gradientUnits="userSpaceOnUse"
-   x1="346.77341"
-   y1="55.888199"
-   x2="346.77341"
-   y2="339.22119" />
-	<linearGradient
-   y2="339.22189"
-   x2="288.49411"
-   y1="55.888199"
-   x1="288.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-		<stop
-   id="stop261"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop263"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="251.2114"
-   y1="55.888199"
-   x1="251.2114"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-		<stop
-   id="stop268"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop270"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22171"
-   x2="293.22461"
-   y1="55.888199"
-   x1="293.22461"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_3_">
-		<stop
-   id="stop275"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop277"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="375.33401"
-   y1="55.888199"
-   x1="375.33401"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_4_">
-		<stop
-   id="stop282"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop284"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22159"
-   x2="334.49411"
-   y1="55.888199"
-   x1="334.49411"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_5_">
-		<stop
-   id="stop289"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop291"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="458.42679"
-   y1="55.8867"
-   x1="458.42679"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_6_">
-		<stop
-   id="stop296"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop298"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22131"
-   x2="413.16309"
-   y1="55.888199"
-   x1="413.16309"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_7_">
-		<stop
-   id="stop303"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop305"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.2236"
-   x2="290.76169"
-   y1="55.8867"
-   x1="290.76169"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_8_">
-		<stop
-   id="stop310"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop312"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-	<linearGradient
-   y2="339.22119"
-   x2="346.77341"
-   y1="55.888199"
-   x1="346.77341"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_9_">
-		<stop
-   id="stop317"
-   style="stop-color:#BED5E1"
-   offset="0" />
-		<stop
-   id="stop319"
-   style="stop-color:#567B8F"
-   offset="1" />
-	</linearGradient>
-	
-</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1280"
-   inkscape:window-height="774"
-   id="namedview323"
-   showgrid="false"
-   inkscape:zoom="1"
-   inkscape:cx="33.895785"
-   inkscape:cy="55.236805"
-   inkscape:window-x="0"
-   inkscape:window-y="26"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   units="mm"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-<pattern
-   y="565.223"
-   width="69"
-   height="69"
-   patternUnits="userSpaceOnUse"
-   id="Polka_Dot_Pattern"
-   viewBox="2.125 -70.896 69 69"
-   overflow="visible">
-	<g
-   id="g4">
-		<polygon
-   fill="none"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon6" />
-		<polygon
-   fill="#F6BB60"
-   points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896   "
-   id="polygon8" />
-		<g
-   id="g10">
-			<path
-   fill="#FFFFFF"
-   d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path12" />
-			<path
-   fill="#FFFFFF"
-   d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path14" />
-			<path
-   fill="#FFFFFF"
-   d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path16" />
-			<path
-   fill="#FFFFFF"
-   d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path18" />
-			<path
-   fill="#FFFFFF"
-   d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path20" />
-			<path
-   fill="#FFFFFF"
-   d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path22" />
-			<path
-   fill="#FFFFFF"
-   d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path24" />
-			<path
-   fill="#FFFFFF"
-   d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path26" />
-			<path
-   fill="#FFFFFF"
-   d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path28" />
-		</g>
-		<g
-   id="g30">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128     c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path32" />
-		</g>
-		<path
-   fill="#FFFFFF"
-   d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128    c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161    c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631    c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45    c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221    c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337    c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207    c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626    c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path34" />
-		<g
-   id="g36">
-			<g
-   id="g38">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path40" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path42" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path44" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path46" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path48" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path50" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path52" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path54" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path56" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path58" />
-			</g>
-			<g
-   id="g60">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path62" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path64" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path66" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path68" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path70" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path72" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path74" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path76" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path78" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path80" />
-			</g>
-			<g
-   id="g82">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path84" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path86" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path88" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path90" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path92" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path94" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path96" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path98" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path100" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path102" />
-			</g>
-			<g
-   id="g104">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path106" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path108" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path110" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path112" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path114" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path116" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path118" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path120" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      C8.15-41.004,8.149-41.02,8.14-41.04"
-   id="path122" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path124" />
-			</g>
-			<g
-   id="g126">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path128" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path130" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path132" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path134" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path136" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path138" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path140" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path142" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path144" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path146" />
-			</g>
-			<g
-   id="g148">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path150" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path152" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path154" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path156" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path158" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path160" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path162" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path164" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path166" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path168" />
-			</g>
-			<g
-   id="g170">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path172" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path174" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path176" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path178" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path180" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path182" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path184" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path186" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path188" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path190" />
-			</g>
-			<g
-   id="g192">
-				<path
-   fill="#FFFFFF"
-   d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path194" />
-				<path
-   fill="#FFFFFF"
-   d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path196" />
-				<path
-   fill="#FFFFFF"
-   d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path198" />
-				<path
-   fill="#FFFFFF"
-   d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path200" />
-				<path
-   fill="#FFFFFF"
-   d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path202" />
-				<path
-   fill="#FFFFFF"
-   d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path204" />
-				<path
-   fill="#FFFFFF"
-   d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path206" />
-				<path
-   fill="#FFFFFF"
-   d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path208" />
-				<path
-   fill="#FFFFFF"
-   d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239      c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631      C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path210" />
-				<path
-   fill="#FFFFFF"
-   d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128      C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161      c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631      C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45      c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071      c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337      c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207      c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169      c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path212" />
-			</g>
-		</g>
-		<g
-   id="g214">
-			<path
-   fill="#FFFFFF"
-   d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46     c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path216" />
-			<path
-   fill="#FFFFFF"
-   d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path218" />
-			<path
-   fill="#FFFFFF"
-   d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path220" />
-			<path
-   fill="#FFFFFF"
-   d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path222" />
-			<path
-   fill="#FFFFFF"
-   d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path224" />
-			<path
-   fill="#FFFFFF"
-   d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path226" />
-			<path
-   fill="#FFFFFF"
-   d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     c-0.021,0.011-0.021-0.005-0.03-0.025"
-   id="path228" />
-			<path
-   fill="#FFFFFF"
-   d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207     c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169     C15.81-2.74,15.809-2.756,15.8-2.776"
-   id="path230" />
-			<path
-   fill="#FFFFFF"
-   d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46     c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587     c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631     C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221     c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751     C8.15-2.74,8.149-2.756,8.14-2.776"
-   id="path232" />
-			<path
-   fill="#FFFFFF"
-   d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46     C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161     c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631     C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45     c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419     c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337     c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367     c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751     C0.489-2.74,0.488-2.756,0.479-2.776"
-   id="path234" />
-		</g>
-	</g>
-</pattern>
-
-<path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-   d="m 150.66402,0 c -11.24079,0 -20.32231,9.081511 -20.32231,20.322309 0,4.63349 1.54288,8.898031 4.14416,12.312928 5.64309,-6.531492 13.97179,-10.679174 23.27103,-10.679174 4.54961,0 8.86387,1.013111 12.75126,2.789337 0.31474,-1.423374 0.47817,-2.903724 0.47817,-4.423091 C 170.98633,9.081511 161.90482,0 150.66402,0 z m -26.53854,9.404049 c -5.8539,0 -10.55964,4.745576 -10.55964,10.599479 0,1.89532 0.48899,3.686187 1.35482,5.220044 3.53247,-1.99271 7.6164,-3.147966 11.9543,-3.147966 0.41864,0 0.82186,0.01699 1.23528,0.03985 -0.0468,-0.593428 -0.0797,-1.187821 -0.0797,-1.793145 0,-3.260488 0.70816,-6.362694 1.95253,-9.164963 -1.67544,-1.123499 -3.68279,-1.753297 -5.8576,-1.753297 z m 50.12836,7.292122 c -0.43247,0 -0.84934,0.05309 -1.27513,0.0797 0.18418,1.16127 0.31878,2.33386 0.31878,3.546442 0,1.887099 -0.24,3.708046 -0.67741,5.45913 5.1284,2.83813 9.38734,7.08467 12.19339,12.233233 2.91052,-1.515226 6.15729,-2.47869 9.60329,-2.709641 -0.8881,-10.415209 -9.51665,-18.60886 -20.16292,-18.60886 z m -16.49694,7.571057 c -15.72924,0 -28.45123,12.720931 -28.45123,28.451232 0,15.728607 12.72134,28.451231 28.45123,28.451231 15.7299,0 28.45124,-12.72265 28.45124,-28.451231 0,-15.730273 -12.72199,-28.451232 -28.45124,-28.451232 z m -30.88194,0.119543 c -12.20291,0 -22.0756,9.87269 -22.0756,22.075606 0,7.183598 3.4227,13.542949 8.72664,17.57282 2.23603,-4.312671 6.727,-7.252275 11.91445,-7.252275 0.62695,0 1.22873,0.07599 1.83299,0.159391 -0.18969,-1.380056 -0.27893,-2.791988 -0.27893,-4.223853 0,-6.846031 2.22844,-13.176829 6.01699,-18.290078 -2.26779,-2.837739 -3.89072,-6.247406 -4.58248,-9.961916 -0.51269,-0.03551 -1.03226,-0.0797 -1.55406,-0.0797 z M 196.05051,37.5365 c -3.70536,0 -7.17634,0.945989 -10.24085,2.550251 1.74013,3.854499 2.70964,8.131195 2.70964,12.631709 0,8.42684 -3.38806,16.078501 -8.88603,21.637282 4.039,4.484129 9.89911,7.292119 16.41724,7.292119 12.20291,0 22.07561,-9.872692 22.07561,-22.075602 0,-12.202916 -9.8727,-22.035759 -22.07561,-22.035759 z m -93.40293,2.90888 c -11.24112,0 -20.36215,9.041344 -20.36215,20.282461 0,11.241122 9.12103,20.36216 20.36215,20.36216 4.27853,0 8.24193,-1.33304 11.51598,-3.58629 -1.3529,-2.102251 -2.15177,-4.615612 -2.15177,-7.292126 0,-1.389185 0.20497,-2.723795 0.59771,-3.984766 -6.12935,-4.429596 -10.12131,-11.637922 -10.12131,-19.764442 0,-2.064771 0.27209,-4.061306 0.75711,-5.97715 -0.20132,-0.0058 -0.39495,-0.03985 -0.59772,-0.03985 z m 119.50315,17.453277 c -0.59968,0 -1.17994,0.06831 -1.7533,0.15939 0.0316,0.506877 0.0398,0.999386 0.0398,1.514212 0,6.481551 -2.55739,12.364405 -6.69441,16.736019 2.03527,2.366783 5.02479,3.865223 8.40786,3.865223 6.16229,0 11.15735,-4.955213 11.15735,-11.117498 0,-6.162288 -4.99506,-11.157346 -11.15735,-11.157346 z m -96.71028,1.19543 c -6.16197,0 -11.1175,4.955527 -11.1175,11.117498 0,6.161966 4.95553,11.157346 11.1175,11.157346 4.72323,0 8.73232,-2.94722 10.36039,-7.092884 -3.97255,-4.045998 -6.82757,-9.207657 -8.08907,-14.942874 -0.73821,-0.152657 -1.48749,-0.239086 -2.27132,-0.239086 z m 122.21279,9.364201 0,22.035763 -11.67537,0 c -7.63217,0 -13.82714,6.23473 -13.82714,13.866979 0,7.63109 6.19497,13.82714 13.82714,13.82714 l 3.38705,0 1.15558,0 c 2.239,0 4.47478,-1.08741 6.25609,-2.74949 1.78131,-1.66207 3.14086,-3.96444 3.18781,-6.53501 0.0801,-4.41219 0,-17.254039 0,-17.254039 l 0,-0.55787 0,-22.633473 -2.31116,0 z m -106.7519,9.961913 0,30.483469 c 0,5.12322 4.20109,9.2845 9.32436,9.2845 l 0,-2.31116 c -3.87663,0 -7.01319,-3.09673 -7.01319,-6.97334 l 0,-29.048949 c -0.80461,-0.4325 -1.55141,-0.93449 -2.31117,-1.43452 z m -23.11164,2.82919 c -4.09351,3.90587 -6.65456,9.40526 -6.65456,15.50074 0,11.827049 9.61175,21.438039 21.43804,21.438039 l 0,-2.31116 c -10.57945,0 -19.12688,-8.54692 -19.12688,-19.126879 0,-5.69048 2.48389,-10.80462 6.41548,-14.30531 -0.73485,-0.33851 -1.4155,-0.73502 -2.07208,-1.19543 z m -27.21596,9.16496 c -7.63218,0 -13.82714,6.19489 -13.82714,13.827139 l 0,12.7911 2.31117,0 0,-12.7911 c 0,-6.385199 5.13086,-11.555819 11.51597,-11.555819 6.38636,0 11.55582,5.17062 11.55582,11.555819 l 0,12.7911 2.31117,0 0,-12.7911 c 0,-7.632249 -6.23376,-13.827139 -13.86699,-13.827139 z m 77.5834,0.0797 c -7.6326,0 -13.82713,6.23438 -13.82713,13.866979 0,7.63262 6.19453,13.86699 13.82713,13.86699 7.63262,0 13.86699,-6.23437 13.86699,-13.86699 0,-7.632599 -6.23437,-13.866979 -13.86699,-13.866979 z m -154.290153,0.0398 c -7.6319743,0 -13.86698728410754,6.19517 -13.86698728410754,13.827139 0,7.63198 6.23501298410754,13.82714 13.86698728410754,13.82714 7.631973,0 13.82714,-6.19516 13.82714,-13.82714 0,-7.631969 -6.195167,-13.827139 -13.82714,-13.827139 z m 20.760634,1.03604 0,17.333739 c 0,5.12342 4.162235,9.2845 9.284505,9.2845 3.491222,0 6.571552,-1.93031 8.168772,-4.78172 1.585655,2.85141 4.638381,4.78172 8.128923,4.78172 5.123264,0 9.324349,-4.16108 9.324349,-9.2845 l 0,-17.333739 -2.31116,0 0,17.333739 c 0,3.8764 -3.136557,6.97334 -7.013189,6.97334 -3.876637,0 -6.973341,-3.09694 -6.973341,-6.97334 l 0,-17.333739 -2.311165,0 0,17.333739 c 0,3.87661 -3.135236,6.97334 -7.013189,6.97334 -3.875319,0 -6.973341,-3.09694 -6.973341,-6.97334 l 0,-17.333739 -2.311164,0 z m 153.453359,0 0,12.791099 c 0,7.63109 6.19496,13.82714 13.82714,13.82714 7.63218,0 13.86698,-6.19592 13.86698,-13.82714 l 0,-12.791099 -2.31116,0 0,12.791099 c 0,6.38369 -5.17071,11.51598 -11.55582,11.51598 -6.3851,0 -11.51598,-5.13216 -11.51598,-11.51598 l 0,-12.791099 -2.31116,0 z m -19.92384,1.23528 c 6.38563,0 11.55583,5.17021 11.55583,11.555819 0,6.38563 -5.1702,11.55583 -11.55583,11.55583 -6.38561,0 -11.51597,-5.1702 -11.51597,-11.55583 0,-6.385609 5.13036,-11.555819 11.51597,-11.555819 z m 67.82073,0 11.67537,0 c 0.009,1.52706 0.0728,12.045619 0,16.058609 -0.0326,1.78576 -1.01212,3.57763 -2.43071,4.90126 -1.41859,1.32363 -3.25441,2.11193 -4.70203,2.11193 l -4.54263,0 c -6.3851,0 -11.51598,-5.13216 -11.51598,-11.51598 0,-6.385199 5.13088,-11.555819 11.51598,-11.555819 z m -222.110883,0.0399 c 6.384977,0 11.515975,5.131 11.515975,11.515969 0,6.38499 -5.130998,11.51598 -11.515975,11.51598 -6.3849773,0 -11.5558223,-5.13099 -11.5558223,-11.51598 0,-6.384969 5.170845,-11.515969 11.5558223,-11.515969 z"
-   id="circle238"
-   inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
-
-</svg>
\ No newline at end of file
+<svg xml:space="preserve" height="118.23" viewBox="0 0 250.00001 118.22802" xmlns:dc="http://purl.org/dc/elements/1.1/" width="250" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111">
+<path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m150.66 0c-11.241 0-20.322 9.0815-20.322 20.322 0 4.6335 1.5429 8.898 4.1442 12.313 5.6431-6.5315 13.972-10.679 23.271-10.679 4.5496 0 8.8639 1.0131 12.751 2.7893 0.31474-1.4234 0.47817-2.9037 0.47817-4.4231 0.01-11.24-9.08-20.322-20.32-20.322zm-26.539 9.404c-5.8539 0-10.56 4.7456-10.56 10.599 0 1.8953 0.48899 3.6862 1.3548 5.22 3.5325-1.9927 7.6164-3.148 11.954-3.148 0.41864 0 0.82186 0.01699 1.2353 0.03985-0.0468-0.59343-0.0797-1.1878-0.0797-1.7931 0-3.2605 0.70816-6.3627 1.9525-9.165-1.6754-1.1235-3.6828-1.7533-5.8576-1.7533zm50.128 7.2921c-0.43247 0-0.84934 0.05309-1.2751 0.0797 0.18418 1.1613 0.31878 2.3339 0.31878 3.5464 0 1.8871-0.24 3.708-0.67741 5.4591 5.1284 2.8381 9.3873 7.0847 12.193 12.233 2.9105-1.5152 6.1573-2.4787 9.6033-2.7096-0.8881-10.415-9.5166-18.609-20.163-18.609zm-16.497 7.5711c-15.729 0-28.451 12.721-28.451 28.451 0 15.729 12.721 28.451 28.451 28.451s28.451-12.723 28.451-28.451c0-15.73-12.722-28.451-28.451-28.451zm-30.882 0.11954c-12.203 0-22.076 9.8727-22.076 22.076 0 7.1836 3.4227 13.543 8.7266 17.573 2.236-4.3127 6.727-7.2523 11.914-7.2523 0.62695 0 1.2287 0.07599 1.833 0.15939-0.18969-1.3801-0.27893-2.792-0.27893-4.2239 0-6.846 2.2284-13.177 6.017-18.29-2.2678-2.8377-3.8907-6.2474-4.5825-9.9619-0.51269-0.03551-1.0323-0.0797-1.5541-0.0797zm69.18 13.149c-3.7054 0-7.1763 0.94599-10.241 2.5503 1.7401 3.8545 2.7096 8.1312 2.7096 12.632 0 8.4268-3.3881 16.079-8.886 21.637 4.039 4.4841 9.8991 7.2921 16.417 7.2921 12.203 0 22.076-9.8727 22.076-22.076s-9.8727-22.036-22.076-22.036zm-93.403 2.9089c-11.241 0-20.362 9.0413-20.362 20.282s9.121 20.362 20.362 20.362c4.2785 0 8.2419-1.333 11.516-3.5863-1.3529-2.1023-2.1518-4.6156-2.1518-7.2921 0-1.3892 0.20497-2.7238 0.59771-3.9848-6.1294-4.4296-10.121-11.638-10.121-19.764 0-2.0648 0.27209-4.0613 0.75711-5.9772-0.20132-0.0058-0.39495-0.03985-0.59772-0.03985zm119.5 17.453c-0.59968 0-1.1799 0.06831-1.7533 0.15939 0.0316 0.50688 0.0398 0.99939 0.0398 1.5142 0 6.4816-2.5574 12.364-6.6944 16.736 2.0353 2.3668 5.0248 3.8652 8.4079 3.8652 6.1623 0 11.157-4.9552 11.157-11.117 0-6.1623-4.9951-11.157-11.157-11.157zm-96.71 1.1954c-6.162 0-11.118 4.9555-11.118 11.117 0 6.162 4.9555 11.157 11.118 11.157 4.7232 0 8.7323-2.9472 10.36-7.0929-3.9726-4.046-6.8276-9.2077-8.0891-14.943-0.73821-0.15266-1.4875-0.23909-2.2713-0.23909zm122.21 9.3642v22.036h-11.675c-7.6322 0-13.827 6.2347-13.827 13.867 0 7.6311 6.195 13.827 13.827 13.827h3.387 1.1556c2.239 0 4.4748-1.0874 6.2561-2.7495s3.1409-3.9644 3.1878-6.535c0.0801-4.4122 0-17.254 0-17.254v-0.55787-22.633h-2.3112zm-106.75 9.9619v30.483c0 5.1232 4.2011 9.2845 9.3244 9.2845v-2.3112c-3.8766 0-7.0132-3.0967-7.0132-6.9733v-29.049c-0.80461-0.4325-1.5514-0.93449-2.3112-1.4345zm-23.112 2.8292c-4.0935 3.9059-6.6546 9.4053-6.6546 15.501 0 11.827 9.6118 21.438 21.438 21.438v-2.3112c-10.579 0-19.127-8.5469-19.127-19.127 0-5.6905 2.4839-10.805 6.4155-14.305-0.73485-0.33851-1.4155-0.73502-2.0721-1.1954zm-27.216 9.165c-7.6322 0-13.827 6.1949-13.827 13.827v12.791h2.3112v-12.791c0-6.3852 5.1309-11.556 11.516-11.556 6.3864 0 11.556 5.1706 11.556 11.556v12.791h2.3112v-12.791c0-7.6322-6.2338-13.827-13.867-13.827zm77.583 0.0797c-7.6326 0-13.827 6.2344-13.827 13.867s6.1945 13.867 13.827 13.867c7.6326 0 13.867-6.2344 13.867-13.867s-6.2344-13.867-13.867-13.867zm-154.29 0.0398c-7.632 0-13.867 6.1952-13.867 13.827 0 7.632 6.235 13.827 13.867 13.827s13.827-6.1952 13.827-13.827c0-7.632-6.1952-13.827-13.827-13.827zm20.761 1.036v17.334c0 5.1234 4.1622 9.2845 9.2845 9.2845 3.4912 0 6.5716-1.9303 8.1688-4.7817 1.5857 2.8514 4.6384 4.7817 8.1289 4.7817 5.1233 0 9.3243-4.1611 9.3243-9.2845v-17.334h-2.3112v17.334c0 3.8764-3.1366 6.9733-7.0132 6.9733s-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112v17.334c0 3.8766-3.1352 6.9733-7.0132 6.9733-3.8753 0-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112zm153.45 0v12.791c0 7.6311 6.195 13.827 13.827 13.827 7.6322 0 13.867-6.1959 13.867-13.827v-12.791h-2.3112v12.791c0 6.3837-5.1707 11.516-11.556 11.516-6.3851 0-11.516-5.1322-11.516-11.516v-12.791h-2.3112zm-19.924 1.2353c6.3856 0 11.556 5.1702 11.556 11.556 0 6.3856-5.1702 11.556-11.556 11.556-6.3856 0-11.516-5.1702-11.516-11.556 0-6.3856 5.1304-11.556 11.516-11.556zm67.821 0h11.675c0.009 1.5271 0.0728 12.046 0 16.059-0.0326 1.7858-1.0121 3.5776-2.4307 4.9013-1.4186 1.3236-3.2544 2.1119-4.702 2.1119h-4.5426c-6.3851 0-11.516-5.1322-11.516-11.516 0-6.3852 5.1309-11.556 11.516-11.556zm-222.11 0.0399c6.385 0 11.516 5.131 11.516 11.516s-5.131 11.516-11.516 11.516-11.556-5.131-11.556-11.516 5.1708-11.516 11.556-11.516z" fill="#fff"/>
+</svg>
diff --git a/core/img/noise.png b/core/img/noise.png
index 271dd5ebcfbdc858f83f0f7ea18a59bb1980d74f..6c06c8a4d6d0874e78211acbafcf0ca9e77a7017 100644
Binary files a/core/img/noise.png and b/core/img/noise.png differ
diff --git a/core/img/places/calendar-dark.png b/core/img/places/calendar-dark.png
index e372104a28482c72ff9e2113f5b77e36a7a9ea88..920dee610dd3b71f2fdde988eeaf0945b31fd544 100644
Binary files a/core/img/places/calendar-dark.png and b/core/img/places/calendar-dark.png differ
diff --git a/core/img/places/calendar-dark.svg b/core/img/places/calendar-dark.svg
index 6f7cb8e74d7dfeb65e12a8c7524418bee7035ed9..986be039ab9b6e3c323830624c1b2a17c7c487a3 100644
--- a/core/img/places/calendar-dark.svg
+++ b/core/img/places/calendar-dark.svg
@@ -1,75 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg4375"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="calendar-dark.svg"
-   inkscape:export-filename="calendar-dark.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4377" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="16.386906"
-     inkscape:cy="22.866321"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4380">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(580.71429,-1.576468)">
-    <path
-       sodipodi:nodetypes="sssssssssssssscssscsssssscsssccsssssssss"
-       id="path2995"
-       d="m -572.71429,4.576468 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m 16,0 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m -13,4 0,2 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-1.875 c -1.72799,0.4425402 -3,2.00525 -3,3.875 l 0,16 c 0,2.216 1.784,4 4,4 l 20,0 c 2.216,0 4,-1.784 4,-4 l 0,-16 c 0,-1.86975 -1.27201,-3.4324598 -3,-3.875 l 0,1.875 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-2 z m -4.90615,10.000125 19.8123,0 c 0.0554,0 0.0937,0.03835 0.0937,0.09375 l 0,9.81225 c 0,0.05539 -0.0384,0.09375 -0.0937,0.09375 l -19.8123,0 c -0.0554,0 -0.0937,-0.03835 -0.0937,-0.09375 l 0,-9.81225 c 0,-0.05543 0.0384,-0.09375 0.0937,-0.09375 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m -572.71429,3.576468 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m 16,0 c -1.108,0 -2,0.892 -2,2 l 0,4 c 0,1.108 0.892,2 2,2 1.108,0 2,-0.892 2,-2 l 0,-4 c 0,-1.108 -0.892,-2 -2,-2 z m -13,4 0,2 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-1.875 c -1.72799,0.4425402 -3,2.00525 -3,3.875 l 0,16 c 0,2.216 1.784,4 4,4 l 20,0 c 2.216,0 4,-1.784 4,-4 l 0,-16 c 0,-1.86975 -1.27201,-3.4324598 -3,-3.875 l 0,1.875 c 0,1.662 -1.338,3 -3,3 -1.662,0 -3,-1.338 -3,-3 l 0,-2 z m -4.90615,10.000125 19.8123,0 c 0.0554,0 0.0937,0.03835 0.0937,0.09375 l 0,9.81225 c 0,0.05539 -0.0384,0.09375 -0.0937,0.09375 l -19.8123,0 c -0.0554,0 -0.0937,-0.03835 -0.0937,-0.09375 l 0,-9.81225 c 0,-0.05543 0.0384,-0.09375 0.0937,-0.09375 z"
-       id="path3763"
-       sodipodi:nodetypes="sssssssssssssscssscsssssscsssccsssssssss" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(580.71 -1.5765)">
+  <path d="m-572.71 4.5765c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875c-1.728 0.44254-3 2.0052-3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16c0-1.8698-1.272-3.4325-3-3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2zm-4.9062 10h19.812c0.0554 0 0.0937 0.03835 0.0937 0.09375v9.8122c0 0.05539-0.0384 0.09375-0.0937 0.09375h-19.812c-0.0554 0-0.0937-0.03835-0.0937-0.09375v-9.8122c0-0.05543 0.0384-0.09375 0.0937-0.09375z" fill="#fff"/>
+  <path d="m-572.71 3.5765c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875c-1.728 0.44254-3 2.0052-3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16c0-1.8698-1.272-3.4325-3-3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2zm-4.9062 10h19.812c0.0554 0 0.0937 0.03835 0.0937 0.09375v9.8122c0 0.05539-0.0384 0.09375-0.0937 0.09375h-19.812c-0.0554 0-0.0937-0.03835-0.0937-0.09375v-9.8122c0-0.05543 0.0384-0.09375 0.0937-0.09375z"/>
+ </g>
 </svg>
diff --git a/core/img/places/contacts-dark.svg b/core/img/places/contacts-dark.svg
index df364911c519e617ecdee7dca235072513107705..3fc10cfe08f040abb1bb5edba44fc638e12224c8 100644
--- a/core/img/places/contacts-dark.svg
+++ b/core/img/places/contacts-dark.svg
@@ -1,73 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3301"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="contacts-dark.svg"
-   inkscape:export-filename="contacts-dark.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3303" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="20.488654"
-     inkscape:cy="17.050062"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3306">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-359.05493,-515.86218)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path2995"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 368.28616,523.52657 c -1.95489,0 -3.61329,1.42966 -3.61329,3.27468 0.0139,0.58316 0.066,1.30227 0.41402,2.82301 l 0,0.0376 0.0377,0.0377 c 0.11171,0.32 0.27429,0.50305 0.4893,0.7528 0.21502,0.24974 0.47136,0.54371 0.71513,0.79045 0.0288,0.029 0.047,0.0469 0.0752,0.0753 0.0483,0.21038 0.1069,0.43679 0.15055,0.63988 0.11614,0.54034 0.10423,0.92299 0.0752,1.05392 -0.84004,0.29496 -1.88513,0.64623 -2.82289,1.05393 -0.52647,0.22889 -1.00287,0.43328 -1.39261,0.67751 -0.38974,0.24425 -0.77735,0.42877 -0.90332,0.97865 -0.002,0.025 -0.002,0.0502 0,0.0753 -0.1231,1.13039 -0.30932,2.79261 -0.45166,3.91458 -0.0307,0.23616 0.0937,0.48512 0.3011,0.60223 1.70267,0.91975 4.31819,1.28993 6.92547,1.27976 2.60727,-0.0102 5.20196,-0.4021 6.85019,-1.27976 0.20736,-0.11711 0.33184,-0.36607 0.3011,-0.60223 -0.0454,-0.35072 -0.10126,-1.14154 -0.15055,-1.91966 -0.0493,-0.77812 -0.092,-1.54354 -0.15055,-1.99492 -0.0204,-0.1119 -0.0734,-0.21766 -0.15056,-0.30112 -0.52359,-0.62524 -1.30583,-1.00746 -2.22067,-1.39269 -0.83517,-0.35169 -1.81429,-0.71689 -2.78523,-1.1292 -0.0543,-0.12106 -0.10833,-0.47327 0,-1.01628 0.029,-0.1458 0.0747,-0.30196 0.11292,-0.45168 0.0913,-0.1022 0.16236,-0.18571 0.26346,-0.30112 0.21564,-0.24614 0.44734,-0.50432 0.63986,-0.7528 0.19251,-0.24849 0.35001,-0.46165 0.45166,-0.7528 l 0.0377,-0.0376 c 0.39341,-1.58787 0.39363,-2.25045 0.41403,-2.82301 l 0,-0.0377 c 0,-1.84501 -1.6584,-3.27468 -3.61329,-3.27468 z m 10.33571,-3.00497 c -2.85015,0 -5.26802,2.08432 -5.26802,4.77416 0.0202,0.85019 0.0963,1.89859 0.60362,4.11566 l 0,0.0549 0.0549,0.0549 c 0.16287,0.46651 0.39989,0.73339 0.71338,1.0975 0.31349,0.36411 0.68722,0.79267 1.04262,1.15239 0.0418,0.0423 0.0686,0.0686 0.10975,0.10977 0.0705,0.3067 0.15586,0.63679 0.21951,0.93288 0.16931,0.78776 0.15194,1.34562 0.10976,1.5365 -1.22474,0.43004 -2.74844,0.94215 -4.11565,1.53651 -0.76758,0.3337 -1.46216,0.63168 -2.03038,0.98778 -0.56823,0.35608 -1.13334,0.6251 -1.31701,1.42675 -0.003,0.0365 -0.003,0.0733 0,0.10977 -0.17948,1.64799 -0.45098,4.07134 -0.6585,5.70704 -0.0448,0.34431 0.13667,0.70727 0.439,0.87801 2.48242,1.34091 6.29573,1.88059 10.09705,1.86576 3.8013,-0.0148 7.58424,-0.58622 9.98729,-1.86576 0.30232,-0.17074 0.4838,-0.5337 0.439,-0.87801 -0.0663,-0.51129 -0.14765,-1.66422 -0.21951,-2.79864 -0.0719,-1.13442 -0.13422,-2.25035 -0.21948,-2.90841 -0.0298,-0.16311 -0.10688,-0.31733 -0.2195,-0.43899 -0.76337,-0.91154 -1.90387,-1.46878 -3.23765,-2.0304 -1.21766,-0.51271 -2.64517,-1.04515 -4.06077,-1.64625 -0.0791,-0.1765 -0.15794,-0.69001 0,-1.48165 0.0424,-0.21256 0.10883,-0.44024 0.16463,-0.65849 0.13304,-0.14901 0.23672,-0.27077 0.38413,-0.43901 0.3144,-0.35883 0.6522,-0.73526 0.93288,-1.09751 0.28067,-0.36226 0.51031,-0.67304 0.65849,-1.09752 l 0.0549,-0.0549 c 0.57359,-2.31494 0.57389,-3.28093 0.60364,-4.11566 l 0,-0.0549 c 0,-2.68983 -2.41788,-4.77415 -5.26803,-4.77415 z" />
-    <path
-       d="m 368.28616,522.52661 c -1.95489,0 -3.61329,1.42966 -3.61329,3.27468 0.0139,0.58316 0.066,1.30227 0.41402,2.82301 l 0,0.0376 0.0377,0.0377 c 0.11171,0.32 0.27429,0.50305 0.4893,0.7528 0.21502,0.24974 0.47136,0.54371 0.71513,0.79045 0.0288,0.029 0.047,0.0469 0.0752,0.0753 0.0483,0.21038 0.1069,0.43679 0.15055,0.63988 0.11614,0.54034 0.10423,0.92299 0.0752,1.05392 -0.84004,0.29496 -1.88513,0.64623 -2.82289,1.05393 -0.52647,0.22889 -1.00287,0.43328 -1.39261,0.67751 -0.38974,0.24425 -0.77735,0.42877 -0.90332,0.97865 -0.002,0.025 -0.002,0.0502 0,0.0753 -0.1231,1.13039 -0.30932,2.79261 -0.45166,3.91458 -0.0307,0.23616 0.0937,0.48512 0.3011,0.60223 1.70267,0.91975 4.31819,1.28993 6.92547,1.27976 2.60727,-0.0102 5.20196,-0.4021 6.85019,-1.27976 0.20736,-0.11711 0.33184,-0.36607 0.3011,-0.60223 -0.0454,-0.35072 -0.10126,-1.14154 -0.15055,-1.91966 -0.0493,-0.77812 -0.092,-1.54354 -0.15055,-1.99492 -0.0204,-0.1119 -0.0734,-0.21766 -0.15056,-0.30112 -0.52359,-0.62524 -1.30583,-1.00746 -2.22067,-1.39269 -0.83517,-0.35169 -1.81429,-0.71689 -2.78523,-1.1292 -0.0543,-0.12106 -0.10833,-0.47327 0,-1.01628 0.029,-0.1458 0.0747,-0.30196 0.11292,-0.45168 0.0913,-0.1022 0.16236,-0.18571 0.26346,-0.30112 0.21564,-0.24614 0.44734,-0.50432 0.63986,-0.7528 0.19251,-0.24849 0.35001,-0.46165 0.45166,-0.7528 l 0.0377,-0.0376 c 0.39341,-1.58787 0.39363,-2.25045 0.41403,-2.82301 l 0,-0.0377 c 0,-1.84501 -1.6584,-3.27468 -3.61329,-3.27468 z m 10.33571,-3.00497 c -2.85015,0 -5.26802,2.08432 -5.26802,4.77416 0.0202,0.85019 0.0963,1.89859 0.60362,4.11566 l 0,0.0549 0.0549,0.0549 c 0.16287,0.46651 0.39989,0.73339 0.71338,1.0975 0.31349,0.36411 0.68722,0.79267 1.04262,1.15239 0.0418,0.0423 0.0686,0.0686 0.10975,0.10977 0.0705,0.3067 0.15586,0.63679 0.21951,0.93288 0.16931,0.78776 0.15194,1.34562 0.10976,1.5365 -1.22474,0.43004 -2.74844,0.94215 -4.11565,1.53651 -0.76758,0.3337 -1.46216,0.63168 -2.03038,0.98778 -0.56823,0.35608 -1.13334,0.6251 -1.31701,1.42675 -0.003,0.0365 -0.003,0.0733 0,0.10977 -0.17948,1.64799 -0.45098,4.07134 -0.6585,5.70704 -0.0448,0.34431 0.13667,0.70727 0.439,0.87801 2.48242,1.34091 6.29573,1.88059 10.09705,1.86576 3.8013,-0.0148 7.58424,-0.58622 9.98729,-1.86576 0.30232,-0.17074 0.4838,-0.5337 0.439,-0.87801 -0.0663,-0.51129 -0.14765,-1.66422 -0.21951,-2.79864 -0.0719,-1.13442 -0.13422,-2.25035 -0.21948,-2.90841 -0.0298,-0.16311 -0.10688,-0.31733 -0.2195,-0.43899 -0.76337,-0.91154 -1.90387,-1.46878 -3.23765,-2.0304 -1.21766,-0.51271 -2.64517,-1.04515 -4.06077,-1.64625 -0.0791,-0.1765 -0.15794,-0.69001 0,-1.48165 0.0424,-0.21256 0.10883,-0.44024 0.16463,-0.65849 0.13304,-0.14901 0.23672,-0.27077 0.38413,-0.43901 0.3144,-0.35883 0.6522,-0.73526 0.93288,-1.09751 0.28067,-0.36226 0.51031,-0.67304 0.65849,-1.09752 l 0.0549,-0.0549 c 0.57359,-2.31494 0.57389,-3.28093 0.60364,-4.11566 l 0,-0.0549 c 0,-2.68983 -2.41788,-4.77415 -5.26803,-4.77415 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="path3763"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(-359.05 -515.86)">
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m368.29 523.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z" fill="#fff"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m368.29 522.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z"/>
+ </g>
 </svg>
diff --git a/core/img/places/file.svg b/core/img/places/file.svg
index 478714b75d105735a987b4ea92d6447014c8c673..f93f3ef6faea6eb62d979a77efaae857fec83b70 100644
--- a/core/img/places/file.svg
+++ b/core/img/places/file.svg
@@ -1,1841 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="folder.svg"
-   inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/folder.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="14.025105"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4566-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       id="linearGradient3587-6-5-26">
-      <stop
-         id="stop3589-9-2-45"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-20"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       id="linearGradient4580-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-1"
-       id="linearGradient4578-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-1">
-      <stop
-         id="stop3589-9-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="1013.451"
-       x2="209.34245"
-       y1="998.45801"
-       x1="209.34245"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3528"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       id="linearGradient3335-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-4">
-      <stop
-         id="stop3589-9-2-8-7-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-6"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3567"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       inkscape:collect="always" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <g
-       transform="translate(-3.1068569e-8,20)"
-       id="g3546">
-      <path
-         sodipodi:nodetypes="ccccccccccccscccccssss"
-         inkscape:connector-curvature="0"
-         id="path4160-9-8"
-         d="m 3.3500571,-17.998043 c -0.1974696,0.03825 -0.3535533,0.233327 -0.3499974,0.437439 l 0,13.123165 c 4.7e-6,0.229041 0.205219,0.437433 0.430766,0.437439 l 10.1387373,0 c 0.225547,-6e-6 0.43076,-0.208398 0.430766,-0.437439 l 0,-10.143113 c -0.0033,-0.06685 -0.02179,-0.132893 -0.05384,-0.191379 -0.965556,-1.389642 -2.035099,-2.419138 -3.311513,-3.198772 -0.04304,-0.01632 -0.08869,-0.02559 -0.134615,-0.02734 l -7.0695295,0 c -0.026843,-0.0026 -0.053928,-0.0026 -0.080774,0 z M 9.0000021,-15.5 c 0,-0.235702 0.2642971,-0.5 0.4999991,-0.5 0.235702,0 0.2493941,0 0.4999988,0 0,0.24431 0,2 0,2 0,0 1.684071,0 2,0 0,0.287357 0,0.264298 0,0.5 0,0.235702 -0.264298,0.5 -0.5,0.5 -0.401508,0 -1.438744,0 -1.9999998,0 -0.2357023,0 -0.5,-0.264298 -0.5,-0.5 0,-0.464108 1.9e-6,-1.491737 1.9e-6,-2 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.6;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992162;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-      <path
-         sodipodi:nodetypes="ccccccccccccscccccssss"
-         inkscape:connector-curvature="0"
-         id="path4160-9"
-         d="m 3.350057,-18.998043 c -0.1974696,0.03825 -0.3535533,0.233327 -0.3499974,0.437439 l 0,13.123165 c 4.7e-6,0.229041 0.205219,0.437433 0.430766,0.437439 l 10.1387374,0 c 0.225547,-6e-6 0.43076,-0.208398 0.430766,-0.437439 l 0,-10.143113 c -0.0033,-0.06685 -0.02179,-0.132893 -0.05384,-0.191379 -0.965556,-1.389642 -2.035099,-2.419138 -3.311513,-3.198772 -0.04304,-0.01632 -0.08869,-0.02559 -0.134615,-0.02734 l -7.0695296,0 c -0.026843,-0.0026 -0.053928,-0.0026 -0.080774,0 z M 9.000002,-16.5 c 0,-0.235702 0.2642971,-0.5 0.4999991,-0.5 0.235702,0 0.2493941,0 0.4999989,0 0,0.24431 0,2 0,2 0,0 1.684071,0 2,0 0,0.287357 0,0.264298 0,0.5 0,0.235702 -0.264298,0.5 -0.5,0.5 -0.401508,0 -1.438744,0 -1.9999999,0 -0.2357023,0 -0.5,-0.264298 -0.5,-0.5 0,-0.464108 1.9e-6,-1.491737 1.9e-6,-2 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:url(#linearGradient3567);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992162;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    </g>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="54.703" gradientUnits="userSpaceOnUse" y1="2.2401" gradientTransform="matrix(.21864 0 0 .26685 18.619 -19.598)" x2="-41.553" x1="-41.553">
+   <stop offset="0"/>
+   <stop stop-color="#363636" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g transform="translate(-3.1069e-8 20)">
+  <path opacity=".6" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m3.3501-17.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="#fff"/>
+  <path opacity=".7" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m3.3501-18.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="url(#a)"/>
+ </g>
 </svg>
diff --git a/core/img/places/files.png b/core/img/places/files.png
index 9c7ff2642f91b06a93376754d762f402e3f36581..52e0c6bf949ca5021b22b36b9753d16faedee8ed 100644
Binary files a/core/img/places/files.png and b/core/img/places/files.png differ
diff --git a/core/img/places/files.svg b/core/img/places/files.svg
index 8ebf861f6d5264d164326e9cf4c6a372881cac4c..d446ef655aece49a9763837a2ad9a74a25bd7623 100644
--- a/core/img/places/files.svg
+++ b/core/img/places/files.svg
@@ -1,128 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg3349"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="files.svg"
-   inkscape:export-filename="files.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3351">
-    <linearGradient
-       id="linearGradient3754">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3756" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.70779222;"
-         offset="1"
-         id="stop3758" />
-    </linearGradient>
-    <linearGradient
-       y2="1013.451"
-       x2="209.34245"
-       y1="998.45801"
-       x1="209.34245"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3528"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-2-1">
-      <stop
-         id="stop3589-9-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="9.6005683"
-     inkscape:cy="17.34375"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4530"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3354">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(573.14286,110.2963)">
-    <path
-       inkscape:connector-curvature="0"
-       d="m -570.22204,-108.29572 c -0.50115,0 -0.92082,0.41966 -0.92082,0.92081 l 0,24.157882 c 0,0.51739 0.40324,0.920728 0.92082,0.920728 l 26.15768,0 c 0.51756,0 0.92081,-0.403165 0.92081,-0.920728 l 6.9e-4,-14.154116 c 0,-0.501097 -0.41966,-0.925235 -0.92081,-0.925235 l -21.07897,0 -7e-4,11.004713 c 0,0.480123 -0.52409,0.97706 -1.00422,0.97706 -0.48012,0 -0.99573,-0.496937 -0.99573,-0.97706 l 7e-4,-12.142797 c 0,-0.480124 0.40484,-0.862147 0.88497,-0.862147 l 4.59443,0 14.52051,5.2e-4 -7e-4,-2.95163 c 0,-0.56713 -0.42551,-1.04812 -0.99245,-1.04812 l -13.00724,0 0,-3.07907 c 0,-0.50118 -0.40586,-0.92081 -0.90701,-0.92081 z"
-       id="path5073"
-       sodipodi:nodetypes="ccccccccccsccccccccccc"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-    <path
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-       sodipodi:nodetypes="ccccccccccsccccccccccc"
-       id="rect3845-5"
-       d="m -570.22204,-107.2957 c -0.50115,0 -0.92082,0.41966 -0.92082,0.92081 l 0,24.157884 c 0,0.51739 0.40324,0.920728 0.92082,0.920728 l 26.15768,0 c 0.51756,0 0.92081,-0.403165 0.92081,-0.920728 l 6.9e-4,-14.154116 c 0,-0.501097 -0.41966,-0.925235 -0.92081,-0.925235 l -21.07897,0 -7e-4,11.004713 c 0,0.480123 -0.52409,0.97706 -1.00422,0.97706 -0.48012,0 -0.99573,-0.496937 -0.99573,-0.97706 l 7e-4,-12.142797 c 0,-0.480124 0.40484,-0.862143 0.88497,-0.862143 l 4.59443,0 14.52051,5.2e-4 -7e-4,-2.951636 c 0,-0.56713 -0.42551,-1.04812 -0.99245,-1.04812 l -13.00724,0 0,-3.07907 c 0,-0.50118 -0.40586,-0.92081 -0.90701,-0.92081 z"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill-rule="evenodd" transform="translate(573.14 110.3)">
+  <path d="m-570.22-108.3c-0.50115 0-0.92082 0.41966-0.92082 0.92081v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86215 0.88497-0.86215h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z"/>
+  <path d="m-570.22-107.3c-0.50115 0-0.92082 0.41966-0.92082 0.92081v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86214 0.88497-0.86214h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg
index c04b00fedceb60f32caf2be906b47fb8111d1b95..676f10afe0b2b1046c63a745ebc2dc5b93565d40 100644
--- a/core/img/places/folder.svg
+++ b/core/img/places/folder.svg
@@ -1,1830 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="home.svg"
-   inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/home.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="14.025105"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4566-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       id="linearGradient3587-6-5-26">
-      <stop
-         id="stop3589-9-2-45"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-20"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="18.967093"
-       x2="-2.4040222"
-       y1="4.4573336"
-       x1="-2.4040222"
-       gradientTransform="translate(13.927091,16.573387)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3475"
-       xlink:href="#linearGradient3587-6-5-26"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       id="linearGradient4580-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-1"
-       id="linearGradient4578-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-1">
-      <stop
-         id="stop3589-9-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="1013.451"
-       x2="209.34245"
-       y1="998.45801"
-       x1="209.34245"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3528"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       inkscape:collect="always" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <g
-       transform="translate(-7.5117601e-7,40.000351)"
-       id="g3499">
-      <g
-         style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:evenodd"
-         id="g14154"
-         transform="matrix(0.8666684,0,0,0.8666684,-172.0426,-903.42597)">
-        <path
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-           sodipodi:nodetypes="ccccccccccsccccccccccc"
-           id="rect3845"
-           d="m 200.19539,998.56643 c -0.28913,0 -0.53125,0.24212 -0.53125,0.53125 l 0,13.93752 c 0,0.2985 0.23264,0.5312 0.53125,0.5312 l 15.09127,0 c 0.2986,0 0.53125,-0.2326 0.53125,-0.5312 l 4e-4,-8.166 c 0,-0.2891 -0.24212,-0.5338 -0.53125,-0.5338 l -12.16119,0 -4e-4,6.349 c 0,0.277 -0.30237,0.5637 -0.57937,0.5637 -0.277,0 -0.57447,-0.2867 -0.57447,-0.5637 l 4e-4,-7.0056 c 0,-0.277 0.23357,-0.4974 0.51057,-0.4974 l 2.65069,0 8.37738,3e-4 -4e-4,-1.7029 c 0,-0.3272 -0.24549,-0.6047 -0.57258,-0.6047 l -7.50433,0 0,-1.77642 c 0,-0.28915 -0.23415,-0.53125 -0.52328,-0.53125 z"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         style="opacity:0.7;fill:url(#linearGradient3528);fill-opacity:1;fill-rule:evenodd"
-         id="g14154-0"
-         transform="matrix(0.8666684,0,0,0.8666684,-172.0426,-904.42597)">
-        <path
-           style="fill:url(#linearGradient4578-7);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-           sodipodi:nodetypes="ccccccccccsccccccccccc"
-           id="rect3845-5"
-           d="m 200.19539,998.56643 c -0.28913,0 -0.53125,0.24212 -0.53125,0.53125 l 0,13.93752 c 0,0.2985 0.23264,0.5312 0.53125,0.5312 l 15.09127,0 c 0.2986,0 0.53125,-0.2326 0.53125,-0.5312 l 4e-4,-8.166 c 0,-0.2891 -0.24212,-0.5338 -0.53125,-0.5338 l -12.16119,0 -4e-4,6.349 c 0,0.277 -0.30237,0.5637 -0.57937,0.5637 -0.277,0 -0.57447,-0.2867 -0.57447,-0.5637 l 4e-4,-7.0056 c 0,-0.277 0.23357,-0.4974 0.51057,-0.4974 l 2.65069,0 8.37738,3e-4 -4e-4,-1.7029 c 0,-0.3272 -0.24549,-0.6047 -0.57258,-0.6047 l -7.50433,0 0,-1.77642 c 0,-0.28915 -0.23415,-0.53125 -0.52328,-0.53125 z"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" x2="209.34" y1="998.46" x1="209.34">
+   <stop offset="0"/>
+   <stop stop-color="#363636" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g fill-rule="evenodd" transform="translate(-7.5118e-7 40)">
+  <g opacity=".6" transform="matrix(.86667 0 0 .86667 -172.04 -903.43)" fill="#fff">
+   <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd" fill="#fff"/>
   </g>
+  <g opacity=".7" transform="matrix(.86667 0 0 .86667 -172.04 -904.43)" fill="url(#a)">
+   <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd" fill="url(#a)"/>
+  </g>
+ </g>
 </svg>
diff --git a/core/img/places/home.png b/core/img/places/home.png
index 2945b84e868b2ef01de8c7751fed415ed1011daa..e664719e2ec960407908a497a4372e024f429062 100644
Binary files a/core/img/places/home.png and b/core/img/places/home.png differ
diff --git a/core/img/places/home.svg b/core/img/places/home.svg
index a836a5999f0d3e53137e6101fe4853d8693c0cb8..80b7dcc8663a7a52bafa4c9c69a077b4c1bc8257 100644
--- a/core/img/places/home.svg
+++ b/core/img/places/home.svg
@@ -1,1819 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="home.svg"
-   inkscape:export-filename="home.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="773"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="16.000001"
-     inkscape:cx="2.7409248"
-     inkscape:cy="8.4568105"
-     inkscape:window-x="0"
-     inkscape:window-y="-1"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4085">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4087" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:0.7"
-         id="stop4089" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="28.776533"
-       x2="0.44923753"
-       y1="13.895414"
-       x1="0.86849999"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3456"
-       xlink:href="#linearGradient3587-6-5-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4566-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       id="linearGradient3587-6-5-26">
-      <stop
-         id="stop3589-9-2-45"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-20"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="18.967093"
-       x2="-2.4040222"
-       y1="4.4573336"
-       x1="-2.4040222"
-       gradientTransform="translate(13.927091,16.573387)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3475"
-       xlink:href="#linearGradient3587-6-5-26"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4074"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.426613)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4085"
-       id="linearGradient4083"
-       x1="8"
-       y1="1"
-       x2="8"
-       y2="15.458407"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4085"
-       id="linearGradient4121"
-       gradientUnits="userSpaceOnUse"
-       x1="8"
-       y1="1"
-       x2="8"
-       y2="15.458407"
-       gradientTransform="translate(-20,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4085"
-       id="linearGradient4436"
-       x1="8"
-       y1="1"
-       x2="8"
-       y2="15"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       inkscape:connector-curvature="0"
-       d="M 8,1.030589 0,9 l 3,0 0,6.0001 10,0 L 13,9 l 3,0 -3,-3.030592 0,-3.969524 -3,0 0,1.081169 -2,-2.050464 z"
-       id="path3328"
-       style="fill:url(#linearGradient4436);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.7" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs>
+  <linearGradient id="a" y2="15" gradientUnits="userSpaceOnUse" x2="8" y1="1" x1="8">
+   <stop offset="0"/>
+   <stop stop-color="#363636" stop-opacity=".7" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path opacity=".7" d="m8 1.0306-8 7.9694h3v6.0001h10v-6h3l-3-3.0306v-3.9695h-3v1.0812l-2-2.0505z" fill-rule="evenodd" fill="url(#a)"/>
 </svg>
diff --git a/core/img/places/music.svg b/core/img/places/music.svg
index e8f91f461664dfa933d121c37999e8baaa82bf23..f7eb391d981ace81600eaa8eca236fe22d3ddebc 100644
--- a/core/img/places/music.svg
+++ b/core/img/places/music.svg
@@ -1,73 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg4375"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="music.svg"
-   inkscape:export-filename="music.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4377" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="7.9636746"
-     inkscape:cy="12.572189"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4380">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(581.71429,-2.0764682)">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path4291"
-       d="m -554.98993,2.0786484 c -4.7142,0.75967 -11.02325,1.541691 -15.72435,2.343787 -1.24488,0.607384 -0.96502,2.171403 -1.02008,3.306244 0,5.0638836 0,10.1277666 0,15.1916436 -2.62346,-0.493215 -5.82272,1.674544 -5.96148,5.106844 -0.2265,2.136875 1.66842,3.996904 3.72898,4.04692 3.68932,0.08956 6.21256,-2.358151 6.25258,-5.453711 -0.0402,-5.198808 0.012,-10.399665 0,-15.599277 0.57116,-0.0423 9.22205,-1.6930062 9.99999,-1.8029142 0,3.8942932 0,7.7885872 0,11.6828792 -2.29278,-0.549271 -5.22379,0.957442 -5.95053,4.0345 -0.30674,1.72477 0.273,3.88966 2.0231,4.619966 3.41645,1.569871 8.10651,-1.610073 7.91585,-5.342127 -0.053,-6.932337 0.0434,-13.867516 0,-20.8005996 -0.0898,-0.651515 -0.53122,-1.381183 -1.26406,-1.334155 z"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m -554.98993,3.0786486 c -4.7142,0.75967 -11.02325,1.541691 -15.72435,2.343787 -1.24488,0.607384 -0.96502,2.171403 -1.02008,3.306244 0,5.0638834 0,10.1277664 0,15.1916434 -2.62346,-0.493215 -5.82272,1.674544 -5.96148,5.106844 -0.2265,2.136875 1.66842,3.996904 3.72898,4.04692 3.68932,0.08956 6.21256,-2.358151 6.25258,-5.453711 -0.0402,-5.198808 0.012,-10.399665 0,-15.599277 0.57116,-0.0423 9.22205,-1.693006 9.99999,-1.802914 0,3.894293 0,7.788587 0,11.682879 -2.29278,-0.549271 -5.22379,0.957442 -5.95053,4.0345 -0.30674,1.72477 0.273,3.88966 2.0231,4.619966 3.41645,1.569871 8.10651,-1.610073 7.91585,-5.342127 -0.053,-6.932337 0.0434,-13.867516 0,-20.8005994 -0.0898,-0.651515 -0.53122,-1.381183 -1.26406,-1.334155 z"
-       id="path4031-1"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(581.71 -2.0765)">
+  <path d="m-554.99 2.0786c-4.7142 0.75967-11.023 1.5417-15.724 2.3438-1.2449 0.60738-0.96502 2.1714-1.0201 3.3062v15.192c-2.6235-0.49322-5.8227 1.6745-5.9615 5.1068-0.2265 2.1369 1.6684 3.9969 3.729 4.0469 3.6893 0.08956 6.2126-2.3582 6.2526-5.4537-0.0402-5.1988 0.012-10.4 0-15.599 0.57116-0.0423 9.222-1.693 10-1.8029v11.683c-2.2928-0.54927-5.2238 0.95744-5.9505 4.0345-0.30674 1.7248 0.273 3.8897 2.0231 4.62 3.4164 1.5699 8.1065-1.6101 7.9158-5.3421-0.053-6.9323 0.0434-13.868 0-20.801-0.0898-0.65152-0.53122-1.3812-1.2641-1.3342z"/>
+  <path d="m-554.99 3.0786c-4.7142 0.75967-11.023 1.5417-15.724 2.3438-1.2449 0.60738-0.96502 2.1714-1.0201 3.3062v15.192c-2.6235-0.49322-5.8227 1.6745-5.9615 5.1068-0.2265 2.1369 1.6684 3.9969 3.729 4.0469 3.6893 0.08956 6.2126-2.3582 6.2526-5.4537-0.0402-5.1988 0.012-10.4 0-15.599 0.57116-0.0423 9.222-1.693 10-1.8029v11.683c-2.2928-0.54927-5.2238 0.95744-5.9505 4.0345-0.30674 1.7248 0.273 3.8897 2.0231 4.62 3.4164 1.5699 8.1065-1.6101 7.9158-5.3421-0.053-6.9323 0.0434-13.868 0-20.801-0.0898-0.65152-0.53122-1.3812-1.2641-1.3342z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index a278240a6d6fd073b0b94ca43dc3356a84c4e77d..7b3af8c7f841c99e326bedcd9cf7764906a91c6e 100644
Binary files a/core/img/places/picture.png and b/core/img/places/picture.png differ
diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg
index aba68e620630b0f000a3d5913e4e4a2d4111cb02..791cbb5909af782233e6eb109bcf8193a415f8eb 100644
--- a/core/img/places/picture.svg
+++ b/core/img/places/picture.svg
@@ -1,75 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg4375"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="picture.svg"
-   inkscape:export-filename="picture.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4377" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="13.989783"
-     inkscape:cy="8.9886524"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4380">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(581.71429,-2.0764682)">
-    <path
-       sodipodi:nodetypes="cccccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path3770"
-       d="m -575.01366,3.0805705 c -0.39495,0.0765 -0.70712,0.466654 -0.70001,0.874878 l -6.2e-4,26.2461415 c 10e-6,0.458082 0.41045,0.874866 0.86155,0.874878 l 20.28048,0 c 0.4511,-1.2e-5 0.86154,-0.416796 0.86155,-0.874878 l 6.1e-4,-25.9212225 c -6.5e-4,-0.672871 -0.53099,-1.203711 -1.03374,-1.199797 0,0 -15.52067,0 -20.26982,0 z m 1.29978,19.9958975 18,0 8.2e-4,6 -18.00082,0 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992161999999996;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992161999999996;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m -575.01366,4.0805703 c -0.39495,0.0765 -0.70712,0.466654 -0.70001,0.874878 l -6.2e-4,26.2461417 c 10e-6,0.458082 0.41045,0.874866 0.86155,0.874878 l 20.28048,0 c 0.4511,-1.2e-5 0.86154,-0.416796 0.86155,-0.874878 l 6.1e-4,-25.9212227 c -6.5e-4,-0.672871 -0.53099,-1.203711 -1.03374,-1.199797 0,0 -15.52067,0 -20.26982,0 z m 1.29978,19.9958977 18,0 8.2e-4,6 -18.00082,0 z"
-       id="path4160-9-9-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="translate(581.71 -2.0765)">
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-575.01 3.0806c-0.39495 0.0765-0.70712 0.46665-0.70001 0.87488l-0.00062 26.246c0.00001 0.45808 0.41045 0.87487 0.86155 0.87488h20.28c0.4511-0.000012 0.86154-0.4168 0.86155-0.87488l0.00061-25.921c-0.00065-0.67287-0.53099-1.2037-1.0337-1.1998h-20.27zm1.2998 19.996h18l0.00082 6h-18.001z"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m-575.01 4.0806c-0.39495 0.0765-0.70712 0.46665-0.70001 0.87488l-0.00062 26.246c0.00001 0.45808 0.41045 0.87487 0.86155 0.87488h20.28c0.4511-0.000012 0.86154-0.4168 0.86155-0.87488l0.00061-25.921c-0.00065-0.67287-0.53099-1.2037-1.0337-1.1998h-20.27zm1.2998 19.996h18l0.00082 6h-18.001z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png
index 445d965ffeb2a64310790eb99829e92f22d48672..015f94837142b64ed34837e2e36922734de24769 100644
Binary files a/core/img/rating/s1.png and b/core/img/rating/s1.png differ
diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png
index b8d66c2a4c41085dae62d3c3408702a950cd86ed..b47b05e4f8983d5c160589bae38aa083a8ba5f0e 100644
Binary files a/core/img/rating/s10.png and b/core/img/rating/s10.png differ
diff --git a/core/img/rating/s11.png b/core/img/rating/s11.png
index aee9f9215608b2161c78f7091bb680dd7939096d..3dcb4bb4830a52f9767079fb4acc39d2cee43ef5 100644
Binary files a/core/img/rating/s11.png and b/core/img/rating/s11.png differ
diff --git a/core/img/rating/s2.png b/core/img/rating/s2.png
index 4f860e74ca12642e13c7fccea7268977e6f4d8e9..94ac5bc956648b35bee893bfa64bcb237dab79a2 100644
Binary files a/core/img/rating/s2.png and b/core/img/rating/s2.png differ
diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png
index 26c9baff55f066f80c1d73336c0302d1ee57a409..42a814ca081f5a6071fdf210b4a6095d1188d044 100644
Binary files a/core/img/rating/s3.png and b/core/img/rating/s3.png differ
diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png
index 47f1f694bf74df3a1664d8b5e3d3e9e3395b4656..5ce388875703076a48cbf08db65c0ee4546e29e4 100644
Binary files a/core/img/rating/s4.png and b/core/img/rating/s4.png differ
diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png
index aa225b6a9a9e2b12e4f9c5cf91fe0f0b29a20765..da4bbc584795ae60fe2c469ce217f0ad964da283 100644
Binary files a/core/img/rating/s5.png and b/core/img/rating/s5.png differ
diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png
index fd4f42e22c6c7e4f9ca8992df46ccfd48bd9a309..267c52ad3c03150291f8ed3ca498a82acafd951a 100644
Binary files a/core/img/rating/s6.png and b/core/img/rating/s6.png differ
diff --git a/core/img/rating/s7.png b/core/img/rating/s7.png
index 0d18a1dc025eca5097601a17f12e783c78a3bc94..3381d066d871291a5fcb47078173953d0242708e 100644
Binary files a/core/img/rating/s7.png and b/core/img/rating/s7.png differ
diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png
index 951c3fd3be43add49758497907ec9075314bdb1f..091dc5b21f07050da2c6447e930de48672381554 100644
Binary files a/core/img/rating/s8.png and b/core/img/rating/s8.png differ
diff --git a/core/img/rating/s9.png b/core/img/rating/s9.png
index b1a654c85d2a2bced5329366cc8c95b90dbd8620..dfe83563433e62e9169976187f265d5e7665cec8 100644
Binary files a/core/img/rating/s9.png and b/core/img/rating/s9.png differ
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
index f225423303130d4524e184c622efc42c8d8a3b7c..7e76e21209e539354805d12d8f92c5a8176c0861 100644
Binary files a/core/img/remoteStorage-big.png and b/core/img/remoteStorage-big.png differ
diff --git a/core/js/compatibility.js b/core/js/compatibility.js
index cc37949409d3585e2acb3f1e49b38652ed053d60..b690803ca7727c9214b8bc788d480afb4afd551d 100644
--- a/core/js/compatibility.js
+++ b/core/js/compatibility.js
@@ -133,4 +133,18 @@ if(!String.prototype.trim) {
 	String.prototype.trim = function () {
 		return this.replace(/^\s+|\s+$/g,'');
 	};
-}
\ No newline at end of file
+}
+
+// Older Firefoxes doesn't support outerHTML
+// From http://stackoverflow.com/questions/1700870/how-do-i-do-outerhtml-in-firefox#answer-3819589
+function outerHTML(node){
+	// In newer browsers use the internal property otherwise build a wrapper.
+	return node.outerHTML || (
+	function(n){
+		var div = document.createElement('div'), h;
+		div.appendChild( n.cloneNode(true) );
+		h = div.innerHTML;
+		div = null;
+		return h;
+	})(node);
+}
diff --git a/core/js/config.php b/core/js/config.php
index 0aaa44822876b339d4b47c73ad8f6145069b6d0e..53a8fb96388601b1f8e57e387fbee1076892ae91 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,8 @@ $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" =>  "\"".OC_User::getUser(). "\"",
-	"oc_requesttoken" =>  "\"".OC_Util::callRegister(). "\"",
+	"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/jquery-1.10.0.min.js b/core/js/jquery-1.10.0.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..01c688164ad8d7aec3d4fd75541e02a526d772eb
--- /dev/null
+++ b/core/js/jquery-1.10.0.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.0 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.0.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.0",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),r.attributes=ct(function(e){return e.innerHTML="<a href='#'></a>",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="<input>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;
+if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})
+}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(n.unit=o,n.start=+a||+r||0,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);a.finish=function(){t.stop(!0)},(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/core/js/jquery-1.7.2.min.js b/core/js/jquery-1.7.2.min.js
deleted file mode 100644
index 16ad06c5acaad09ee4d6e9d7c428506db028aeeb..0000000000000000000000000000000000000000
--- a/core/js/jquery-1.7.2.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.7.2 jquery.com | jquery.org/license */
-(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
-a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
-.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/core/js/jquery-migrate-1.2.1.min.js b/core/js/jquery-migrate-1.2.1.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b7ec47a2d66397db47e3b4c14263f02b7221751
--- /dev/null
+++ b/core/js/jquery-migrate-1.2.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery Migrate v1.2.1 | (c) 2005, 2013 jQuery Foundation, Inc. and other contributors | jquery.org/license */
+jQuery.migrateMute===void 0&&(jQuery.migrateMute=!0),function(e,t,n){function r(n){var r=t.console;i[n]||(i[n]=!0,e.migrateWarnings.push(n),r&&r.warn&&!e.migrateMute&&(r.warn("JQMIGRATE: "+n),e.migrateTrace&&r.trace&&r.trace()))}function a(t,a,i,o){if(Object.defineProperty)try{return Object.defineProperty(t,a,{configurable:!0,enumerable:!0,get:function(){return r(o),i},set:function(e){r(o),i=e}}),n}catch(s){}e._definePropertyBroken=!0,t[a]=i}var i={};e.migrateWarnings=[],!e.migrateMute&&t.console&&t.console.log&&t.console.log("JQMIGRATE: Logging is active"),e.migrateTrace===n&&(e.migrateTrace=!0),e.migrateReset=function(){i={},e.migrateWarnings.length=0},"BackCompat"===document.compatMode&&r("jQuery is not compatible with Quirks Mode");var o=e("<input/>",{size:1}).attr("size")&&e.attrFn,s=e.attr,u=e.attrHooks.value&&e.attrHooks.value.get||function(){return null},c=e.attrHooks.value&&e.attrHooks.value.set||function(){return n},l=/^(?:input|button)$/i,d=/^[238]$/,p=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,f=/^(?:checked|selected)$/i;a(e,"attrFn",o||{},"jQuery.attrFn is deprecated"),e.attr=function(t,a,i,u){var c=a.toLowerCase(),g=t&&t.nodeType;return u&&(4>s.length&&r("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(g)&&(o?a in o:e.isFunction(e.fn[a])))?e(t)[a](i):("type"===a&&i!==n&&l.test(t.nodeName)&&t.parentNode&&r("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[c]&&p.test(c)&&(e.attrHooks[c]={get:function(t,r){var a,i=e.prop(t,r);return i===!0||"boolean"!=typeof i&&(a=t.getAttributeNode(r))&&a.nodeValue!==!1?r.toLowerCase():n},set:function(t,n,r){var a;return n===!1?e.removeAttr(t,r):(a=e.propFix[r]||r,a in t&&(t[a]=!0),t.setAttribute(r,r.toLowerCase())),r}},f.test(c)&&r("jQuery.fn.attr('"+c+"') may use property instead of attribute")),s.call(e,t,a,i))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?u.apply(this,arguments):("input"!==n&&"option"!==n&&r("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var a=(e.nodeName||"").toLowerCase();return"button"===a?c.apply(this,arguments):("input"!==a&&"option"!==a&&r("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t,n)}};var g,h,v=e.fn.init,m=e.parseJSON,y=/^([^<]*)(<[\w\W]+>)([^>]*)$/;e.fn.init=function(t,n,a){var i;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(i=y.exec(e.trim(t)))&&i[0]&&("<"!==t.charAt(0)&&r("$(html) HTML strings must start with '<' character"),i[3]&&r("$(html) HTML text after last tag is ignored"),"#"===i[0].charAt(0)&&(r("HTML string cannot start with a '#' character"),e.error("JQMIGRATE: Invalid selector string (XSS)")),n&&n.context&&(n=n.context),e.parseHTML)?v.call(this,e.parseHTML(i[2],n,!0),n,a):v.apply(this,arguments)},e.fn.init.prototype=e.fn,e.parseJSON=function(e){return e||null===e?m.apply(this,arguments):(r("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(g=e.uaMatch(navigator.userAgent),h={},g.browser&&(h[g.browser]=!0,h.version=g.version),h.chrome?h.webkit=!0:h.webkit&&(h.safari=!0),e.browser=h),a(e,"browser",e.browser,"jQuery.browser is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(r,a){return a&&a instanceof e&&!(a instanceof t)&&(a=t(a)),e.fn.init.call(this,r,a,n)},t.fn.init.prototype=t.fn;var n=t(document);return r("jQuery.sub() is deprecated"),t},e.ajaxSetup({converters:{"text json":e.parseJSON}});var b=e.fn.data;e.fn.data=function(t){var a,i,o=this[0];return!o||"events"!==t||1!==arguments.length||(a=e.data(o,t),i=e._data(o,t),a!==n&&a!==i||i===n)?b.apply(this,arguments):(r("Use of jQuery.fn.data('events') is deprecated"),i)};var j=/\/(java|ecma)script/i,w=e.fn.andSelf||e.fn.addBack;e.fn.andSelf=function(){return r("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)},e.clean||(e.clean=function(t,a,i,o){a=a||document,a=!a.nodeType&&a[0]||a,a=a.ownerDocument||a,r("jQuery.clean() is deprecated");var s,u,c,l,d=[];if(e.merge(d,e.buildFragment(t,a).childNodes),i)for(c=function(e){return!e.type||j.test(e.type)?o?o.push(e.parentNode?e.parentNode.removeChild(e):e):i.appendChild(e):n},s=0;null!=(u=d[s]);s++)e.nodeName(u,"script")&&c(u)||(i.appendChild(u),u.getElementsByTagName!==n&&(l=e.grep(e.merge([],u.getElementsByTagName("script")),c),d.splice.apply(d,[s+1,0].concat(l)),s+=l.length));return d});var Q=e.event.add,x=e.event.remove,k=e.event.trigger,N=e.fn.toggle,T=e.fn.live,M=e.fn.die,S="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",C=RegExp("\\b(?:"+S+")\\b"),H=/(?:^|\s)hover(\.\S+|)\b/,A=function(t){return"string"!=typeof t||e.event.special.hover?t:(H.test(t)&&r("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(H,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&a(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,a,i){e!==document&&C.test(t)&&r("AJAX events should be attached to document: "+t),Q.call(this,e,A(t||""),n,a,i)},e.event.remove=function(e,t,n,r,a){x.call(this,e,A(t)||"",n,r,a)},e.fn.error=function(){var e=Array.prototype.slice.call(arguments,0);return r("jQuery.fn.error() is deprecated"),e.splice(0,0,"error"),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this)},e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return N.apply(this,arguments);r("jQuery.fn.toggle(handler, handler...) is deprecated");var a=arguments,i=t.guid||e.guid++,o=0,s=function(n){var r=(e._data(this,"lastToggle"+t.guid)||0)%o;return e._data(this,"lastToggle"+t.guid,r+1),n.preventDefault(),a[r].apply(this,arguments)||!1};for(s.guid=i;a.length>o;)a[o++].guid=i;return this.click(s)},e.fn.live=function(t,n,a){return r("jQuery.fn.live() is deprecated"),T?T.apply(this,arguments):(e(this.context).on(t,this.selector,n,a),this)},e.fn.die=function(t,n){return r("jQuery.fn.die() is deprecated"),M?M.apply(this,arguments):(e(this.context).off(t,this.selector||"**",n),this)},e.event.trigger=function(e,t,n,a){return n||C.test(e)||r("Global events are undocumented and deprecated"),k.call(this,e,t,n||document,a)},e.each(S.split("|"),function(t,n){e.event.special[n]={setup:function(){var t=this;return t!==document&&(e.event.add(document,n+"."+e.guid,function(){e.event.trigger(n,null,t,!0)}),e._data(this,n,e.guid++)),!1},teardown:function(){return this!==document&&e.event.remove(document,n+"."+e._data(this,n)),!1}}})}(jQuery,window);
\ No newline at end of file
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index 0f4678327a3bc64a2d4dbdb1ee2213993e6ab9e2..e1737643b484e3055fc90ce42119658f006d12ca 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -35,7 +35,8 @@
 					'style'		:	$element.attr('style'),
 					'size'		:	$element.attr('size'),
 					'name'		:	$element.attr('name')+'-clone',
-					'tabindex' 	:	$element.attr('tabindex')
+					'tabindex' 	:	$element.attr('tabindex'),
+					'autocomplete'	:	'off'
 				});
 					
 				return $clone;
@@ -102,7 +103,16 @@
 				$clone.bind('blur', function() { $input.trigger('focusout'); });
 				
 				setState( $checkbox, $input, $clone );
-				
+
+				// set type of password field clone (type=text) to password right on submit
+				// to prevent browser save the value of this field
+				$clone.closest('form').submit(function(e) {
+					// .prop has to be used, because .attr throws
+					// an error while changing a type of an input
+					// element
+					$clone.prop('type', 'password');
+				});
+
 				if( callback.fn ){
 					callback.fn( callback.args );
 				}
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..7413927e3b27064d4331cf041b84e837471cb22e
--- /dev/null
+++ b/core/js/jquery.ocdialog.js
@@ -0,0 +1,217 @@
+(function($) {
+	$.widget('oc.ocdialog', {
+		options: {
+			width: 'auto',
+			height: 'auto',
+			closeButton: true,
+			closeOnEscape: true,
+			modal: false
+		},
+		_create: function() {
+			var self = this;
+
+			this.originalCss = {
+				display: this.element[0].style.display,
+				width: this.element[0].style.width,
+				height: this.element[0].style.height,
+			};
+
+			this.originalTitle = this.element.attr('title');
+			this.options.title = this.options.title || this.originalTitle;
+
+			this.$dialog = $('<div class="oc-dialog" />')
+				.attr({
+					// Setting tabIndex makes the div focusable
+					tabIndex: -1,
+					role: 'dialog'
+				})
+				.insertBefore(this.element);
+			this.$dialog.append(this.element.detach());
+			this.element.removeAttr('title').addClass('oc-dialog-content').appendTo(this.$dialog);
+
+			this.$dialog.css({
+				display: 'inline-block',
+				position: 'fixed'
+			});
+
+			$(document).on('keydown keyup', function(event) {
+				if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
+					return;
+				}
+				// Escape
+				if(event.keyCode === 27 && self.options.closeOnEscape) {
+					self.close();
+					return false;
+				}
+				// Enter
+				if(event.keyCode === 13) {
+					event.stopImmediatePropagation();
+					if(event.type === 'keyup') {
+						event.preventDefault();
+						return false;
+					}
+					// If no button is selected we trigger the primary
+					if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) {
+						var $button = self.$buttonrow.find('button.primary');
+						if($button) {
+							$button.trigger('click');
+						}
+					} else if(self.$buttonrow) {
+						$(event.target).trigger('click');
+					}
+					return false;
+				}
+			});
+			$(window).resize(function() {
+				self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
+				var pos = self.parent.position();
+				self.$dialog.css({
+					left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
+					top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+				});
+			});
+
+			this._setOptions(this.options);
+			$(window).trigger('resize');
+			this._createOverlay();
+		},
+		_init: function() {
+			this.$dialog.focus();
+			this._trigger('open');
+		},
+		_setOption: function(key, value) {
+			var self = this;
+			switch(key) {
+				case 'title':
+					var $title = $('<h3 class="oc-dialog-title">' + this.options.title
+						+ '</h3>'); //<hr class="oc-dialog-separator" />');
+					if(this.$title) {
+						this.$title.replaceWith($title);
+					} else {
+						this.$title = $title.prependTo(this.$dialog);
+					}
+					this._setSizes();
+					break;
+				case 'buttons':
+					var $buttonrow = $('<div class="oc-dialog-buttonrow" />');
+					if(this.$buttonrow) {
+						this.$buttonrow.replaceWith($buttonrow);
+					} else {
+						this.$buttonrow = $buttonrow.appendTo(this.$dialog);
+					}
+					$.each(value, function(idx, val) {
+						var $button = $('<button>').text(val.text);
+						if(val.defaultButton) {
+							$button.addClass('primary');
+							self.$defaultButton = $button;
+						}
+						self.$buttonrow.append($button);
+						$button.click(function() {
+							val.click.apply(self.element[0], arguments);
+						});
+					});
+					this.$buttonrow.find('button')
+						.on('focus', function(event) {
+							self.$buttonrow.find('button').removeClass('primary');
+							$(this).addClass('primary');
+						});
+					this._setSizes();
+					break;
+				case 'closeButton':
+					if(value) {
+						var $closeButton = $('<a class="oc-dialog-close svg"></a>');
+						this.$dialog.prepend($closeButton);
+						$closeButton.on('click', function() {
+							self.close();
+						});
+					}
+					break;
+				case 'width':
+					this.$dialog.css('width', value);
+					break;
+				case 'height':
+					this.$dialog.css('height', value);
+					break;
+				case 'close':
+					this.closeCB = value;
+					break;
+			}
+			//this._super(key, value);
+			$.Widget.prototype._setOption.apply(this, arguments );
+		},
+		_setOptions: function(options) {
+			//this._super(options);
+			$.Widget.prototype._setOptions.apply(this, arguments);
+		},
+		_setSizes: function() {
+			var content_height = this.$dialog.height();
+			if(this.$title) {
+				content_height -= this.$title.outerHeight(true);
+			}
+			if(this.$buttonrow) {
+				content_height -= this.$buttonrow.outerHeight(true);
+			}
+			this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
+			content_height = Math.min(content_height, this.parent.height()-20)
+			this.element.css({
+				height: content_height + 'px',
+				width: this.$dialog.innerWidth()-20 + 'px'
+			});
+		},
+		_createOverlay: function() {
+			if(!this.options.modal) {
+				return;
+			}
+
+			var self = this;
+			this.overlay = $('<div>')
+				.addClass('oc-dialog-dim')
+				.appendTo($('#content'));
+			this.overlay.on('click keydown keyup', function(event) {
+				if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) {
+					event.preventDefault();
+					event.stopPropagation();
+					return;
+				}
+			});
+		},
+		_destroyOverlay: function() {
+			if (!this.options.modal) {
+				return;
+			}
+
+			if (this.overlay) {
+				this.overlay.off('click keydown keyup');
+				this.overlay.remove();
+				this.overlay = null;
+			}
+		},
+		widget: function() {
+			return this.$dialog
+		},
+		close: function() {
+			this._destroyOverlay();
+			var self = this;
+			// Ugly hack to catch remaining keyup events.
+			setTimeout(function() {
+				self._trigger('close', self);
+				self.$dialog.hide();
+			}, 200);
+		},
+		destroy: function() {
+			if(this.$title) {
+				this.$title.remove()
+			}
+			if(this.$buttonrow) {
+				this.$buttonrow.remove()
+			}
+
+			if(this.originalTitle) {
+				this.element.attr('title', this.originalTitle);
+			}
+			this.element.removeClass('oc-dialog-content')
+					.css(this.originalCss).detach().insertBefore(this.$dialog);
+			this.$dialog.remove();
+		}
+	});
+}(jQuery));
diff --git a/core/js/js.js b/core/js/js.js
index d85e6d88f8aed5529840b2a10875b98745596ab3..3cb4d3dd151582915626c2363dc106b4a7de1fc3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -767,6 +767,26 @@ OC.set=function(name, value) {
 	context[tail]=value;
 };
 
+/**
+ * select a range in an input field
+ * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
+ * @param {type} start
+ * @param {type} end
+ */
+$.fn.selectRange = function(start, end) {
+	return this.each(function() {
+		if (this.setSelectionRange) {
+			this.focus();
+			this.setSelectionRange(start, end);
+		} else if (this.createTextRange) {
+			var range = this.createTextRange();
+			range.collapse(true);
+			range.moveEnd('character', end);
+			range.moveStart('character', start);
+			range.select();
+		}
+	});
+};
 
 /**
  * Calls the server periodically every 15 mins to ensure that session doesnt
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index bc4223feb64735cffe364eb953b17d076e544cae..463c397d8cd835bd0112aa5e9cec7fe9147987a7 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -316,4 +316,4 @@
 		
 		return span;
 	};
-})( jQuery );
\ No newline at end of file
+})( jQuery );
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 990c3f8bf38b19cedb8bfed7785864174971e681..f4bc174b5ebdc5be5793eabb6b95cfa531600ecf 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -1,7 +1,7 @@
 /**
  * ownCloud
  *
- * @author Bartek Przybylski
+ * @author Bartek Przybylski, Christopher Schäpers, Thomas Tanghus
  * @copyright 2012 Bartek Przybylski bartek@alefzero.eu
  *
  * This library is free software; you can redistribute it and/or
@@ -23,6 +23,11 @@
  * this class to ease the usage of jquery dialogs
  */
 var OCdialogs = {
+	// dialog button types
+	YES_NO_BUTTONS:		70,
+	OK_BUTTONS:		71,
+	// used to name each dialog
+	dialogs_counter: 0,
 	/**
 	* displays alert dialog
 	* @param text content of dialog
@@ -31,8 +36,7 @@ var OCdialogs = {
 	* @param modal make the dialog modal
 	*/
 	alert:function(text, title, callback, modal) {
-		var content = '<p><span class="ui-icon ui-icon-alert"></span>' + escapeHTML(text) + '</p>';
-		OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+		this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal);
 	},
 	/**
 	* displays info dialog
@@ -42,8 +46,7 @@ var OCdialogs = {
 	* @param modal make the dialog modal
 	*/
 	info:function(text, title, callback, modal) {
-		var content = '<p><span class="ui-icon ui-icon-info"></span>' + escapeHTML(text) + '</p>';
-		OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
+		this.message(text, title, 'info', OCdialogs.OK_BUTTON, callback, modal);
 	},
 	/**
 	* displays confirmation dialog
@@ -53,82 +56,7 @@ var OCdialogs = {
 	* @param modal make the dialog modal
 	*/
 	confirm:function(text, title, callback, modal) {
-		var content = '<p><span class="ui-icon ui-icon-notice"></span>' + escapeHTML(text) + '</p>';
-		OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal);
-	},
-	/**
-	* prompt for user input
-	* @param text content of dialog
-	* @param title dialog title
-	* @param callback which will be triggered when user presses OK (input text will be passed to callback)
-	* @param modal make the dialog modal
-	*/
-	prompt:function(text, title, default_value, callback, modal) {
-		var input = '<input type="text" id="oc-dialog-prompt-input" value="' + escapeHTML(default_value) + '" style="width:90%">';
-		var content = '<p><span class="ui-icon ui-icon-pencil"></span>' + escapeHTML(text) + ':<br/>' + input + '</p>';
-		OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal);
-	},
-	/**
-	* prompt user for input with custom form
-	* fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'default value'},...]
-	* example:
-	* var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hello1',value:1},{text:'hello2',value:2}] }];
-	* @param fields to display 
-	* @param title dialog title
-	* @param callback which will be triggered when user presses OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
-	* @param modal make the dialog modal
-	*/
-	form:function(fields, title, callback, modal) {
-		var content = '<table>';
-		$.each(fields, function(index, field){
-			content += '<tr><td>' + escapeHTML(field.text) + '</td><td>';
-			var type = field.type;
-			
-			if (type === 'text' || type === 'checkbox' || type === 'password') {
-				content += '<input type="' + type + '" name="' + field.name + '"';
-				if (type === 'checkbox' && field.value === true) {
-					content += ' checked="checked"';
-				} else if (type === 'text' || type === 'password' && val.value) {
-					content += ' value="' + escapeHTML(field.value) + '"';
-				}
-				content += '>';
-			} else if (type === 'select') {
-				content += '<select name="' + escapeHTML(field.name) + '"';
-				if (field.value !== undefined) {
-					content += ' value="' + escapeHTML(field.value) + '"';
-				}
-				content += '>';
-				$.each(field.options, function(index, field_option){
-					content += '<option value="' + escapeHTML(field_option.value) + '">' + escapeHTML(field_option.text) + '</option>';
-				});
-				content += '</select>';
-			}
-			content += '</td></tr>';
-
-		});
-		content += '</table>';
-
-		var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
-		var dialog_id = '#' + dialog_name;
-		var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
-		if (modal === undefined) { modal = false };
-		$('body').append(dialog_div);
-		var buttonlist = [{
-			text: t('core', 'Ok'),
-			click: function(){ OCdialogs.form_ok_handler(callback, dialog_id); }
-		},
-		{
-			text: t('core', 'Cancel'),
-			click: function(){ $(dialog_id).dialog('close'); }
-		}];
-		var dialog_height = ( $('tr', dialog_div).length + 1 ) * 30 + 120;
-		$(dialog_id).dialog({
-			width: (4/9) * $(document).width(),
-			height: dialog_height,
-			modal: modal,
-			buttons: buttonlist
-		});
-		OCdialogs.dialogs_counter++;
+		this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
 	},
 	/**
 	 * show a file picker to pick a file from
@@ -139,288 +67,267 @@ var OCdialogs = {
 	 * @param modal make the dialog modal
 	*/
 	filepicker:function(title, callback, multiselect, mimetype_filter, modal) {
-		var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
-		var dialog_id = '#' + dialog_name;
-		var dialog_content = '<button id="dirup">↑</button><select id="dirtree"></select><div id="filelist"></div>';
-		var dialog_loader = '<div class="filepicker_loader"><img src="' + OC.filePath('gallery','img','loading.gif') + '"></div>';
-		var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + dialog_content + dialog_loader + '</div>';
-		if (modal === undefined) { modal = false };
-		if (multiselect === undefined) { multiselect = false };
-		if (mimetype_filter === undefined) { mimetype_filter = '' };
+		var self = this;
+		$.when(this._getFilePickerTemplate()).then(function($tmpl) {
+			var dialog_name = 'oc-dialog-filepicker-content';
+			var dialog_id = '#' + dialog_name;
+			if(self.$filePicker) {
+				self.$filePicker.ocdialog('close');
+			}
+			self.$filePicker = $tmpl.octemplate({
+				dialog_name: dialog_name,
+				title: title
+			}).data('path', '');
 
-		$('body').append(dialog_div);
+			if (modal === undefined) { modal = false };
+			if (multiselect === undefined) { multiselect = false };
+			if (mimetype_filter === undefined) { mimetype_filter = '' };
 
-		$(dialog_id).data('path', '/');
+			$('body').append(self.$filePicker);
 
-		$(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect );
-		$(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp );
 
-		$(dialog_id).ready(function(){
-			$.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) {
-				OCdialogs.fillFilePicker(request, dialog_id);
-			});
-			$.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: "httpd/unix-directory" }, function(request) {
-				OCdialogs.fillTreeList(request, dialog_id);
-			});
-		}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+			self.$filePicker.ready(function() {
+				self.$filelist = self.$filePicker.find('.filelist');
+				self.$dirTree = self.$filePicker.find('.dirtree');
+				self.$dirTree.on('click', 'span:not(:last-child)', self, self._handleTreeListSelect);
+				self.$filelist.on('click', 'li', function(event) {
+					self._handlePickerClick(event, $(this));
+				});
+				self._fillFilePicker('');
+			}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
 
-		// build buttons
-		var functionToCall = function() {
-			if (callback !== undefined) {
-				var datapath;
-				if (multiselect === true) {
-					datapath = [];
-					$(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) {
-						datapath.push( $(dialog_id).data('path') + $(element).text() );
-					});
-				} else {
-					var datapath = $(dialog_id).data('path');
-					datapath += $(dialog_id+' .filepicker_element_selected .filename').text();
+			// build buttons
+			var functionToCall = function() {
+				if (callback !== undefined) {
+					var datapath;
+					if (multiselect === true) {
+						datapath = [];
+						self.$filelist.find('.filepicker_element_selected .filename').each(function(index, element) {
+							datapath.push(self.$filePicker.data('path') + '/' + $(element).text());
+						});
+					} else {
+						var datapath = self.$filePicker.data('path');
+						datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text();
+					}
+					callback(datapath);
+					self.$filePicker.ocdialog('close');
 				}
-				callback(datapath);
-				$(dialog_id).dialog('close');
-			}
-		};
-		var buttonlist = [{
-			text: t('core', 'Choose'), 
-			click: functionToCall
-			},
-			{
-			text: t('core', 'Cancel'), 
-			click: function(){$(dialog_id).dialog('close'); }
-		}];
+			};
+			var buttonlist = [{
+				text: t('core', 'Choose'),
+				click: functionToCall,
+				defaultButton: true
+				},
+				{
+				text: t('core', 'Cancel'),
+				click: function(){self.$filePicker.ocdialog('close'); }
+			}];
 
-		$(dialog_id).dialog({
-			width: (4/9)*$(document).width(),
-			height: 420,
-			modal: modal,
-			buttons: buttonlist
+			self.$filePicker.ocdialog({
+				closeOnEscape: true,
+				width: (4/9)*$(document).width(),
+				height: 420,
+				modal: modal,
+				buttons: buttonlist,
+				close: function(event, ui) {
+					try {
+						$(this).ocdialog('destroy').remove();
+					} catch(e) {}
+					self.$filePicker = null;
+				}
+			});
+		})
+		.fail(function() {
+			alert(t('core', 'Error loading file picker template'));
 		});
-		OCdialogs.dialogs_counter++;
 	},
 	/**
 	 * Displays raw dialog
 	 * You better use a wrapper instead ...
 	*/
 	message:function(content, title, dialog_type, buttons, callback, modal) {
-		var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
-		var dialog_id = '#' + dialog_name;
-		var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
-		if (modal === undefined) { modal = false };
-		$('body').append(dialog_div);
-		var buttonlist = [];
-		switch (buttons) {
-			case OCdialogs.YES_NO_BUTTONS:
-				buttonlist = [{
-					text: t('core', 'Yes'),
-					click: function(){
-						if (callback !== undefined) { callback(true) };
-						$(dialog_id).dialog('close');
-					}
-				},
-				{
-					text: t('core', 'No'),
-					click: function(){
-						if (callback !== undefined) { callback(false) };
-						$(dialog_id).dialog('close');
-					}
-				}];
-			break;
-			case OCdialogs.OK_BUTTON:
-				var functionToCall;
-				switch(dialog_type) {
-					case OCdialogs.ALERT_DIALOG:
-						functionToCall = function() {
-							$(dialog_id).dialog('close');
-							if(callback !== undefined) { callback() };
-						};
-					break;
-					case OCdialogs.PROMPT_DIALOG:
-						buttonlist[1] = {
-							text: t('core', 'Cancel'),
-							click: function() { $(dialog_id).dialog('close'); }
-						};
-						functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); };
-					break;
-				}
-				buttonlist[0] = {
-					text: t('core', 'Ok'),
-					click: functionToCall
-				};
-			break;
-		};
+		$.when(this._getMessageTemplate()).then(function($tmpl) {
+			var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
+			var dialog_id = '#' + dialog_name;
+			var $dlg = $tmpl.octemplate({
+				dialog_name: dialog_name,
+				title: title,
+				message: content,
+				type: dialog_type
+			});
+			if (modal === undefined) { modal = false };
+			$('body').append($dlg);
+			var buttonlist = [];
+			switch (buttons) {
+				case OCdialogs.YES_NO_BUTTONS:
+					buttonlist = [{
+						text: t('core', 'Yes'),
+						click: function(){
+							if (callback !== undefined) { callback(true) };
+							$(dialog_id).ocdialog('close');
+						},
+						defaultButton: true
+					},
+					{
+						text: t('core', 'No'),
+						click: function(){
+							if (callback !== undefined) { callback(false) };
+							$(dialog_id).ocdialog('close');
+						}
+					}];
+				break;
+				case OCdialogs.OK_BUTTON:
+					var functionToCall = function() {
+						$(dialog_id).ocdialog('close');
+						if(callback !== undefined) { callback() };
+					};
+					buttonlist[0] = {
+						text: t('core', 'Ok'),
+						click: functionToCall,
+						defaultButton: true
+					};
+				break;
+			};
 
-		$(dialog_id).dialog({
-			width: (4/9) * $(document).width(),
-			height: 180,
-			modal: modal,
-			buttons: buttonlist
+			$(dialog_id).ocdialog({
+				closeOnEscape: true,
+				modal: modal,
+				buttons: buttonlist
+			});
+			OCdialogs.dialogs_counter++;
+		})
+		.fail(function() {
+			alert(t('core', 'Error loading file picker template'));
 		});
-		OCdialogs.dialogs_counter++;
 	},
-	// dialog button types
-	YES_NO_BUTTONS:		70,
-	OK_BUTTONS:		71,
-	// dialogs types
-	ALERT_DIALOG:	80,
-	INFO_DIALOG:	81,
-	FORM_DIALOG:	82,
-	// used to name each dialog
-	dialogs_counter: 0,
-
-	determineValue: function(element) {
-		if ( $(element).attr('type') === 'checkbox' ) {
-			return element.checked;
+	_getFilePickerTemplate: function() {
+		var defer = $.Deferred();
+		if(!this.$filePickerTemplate) {
+			var self = this;
+			$.get(OC.filePath('core', 'templates', 'filepicker.html'), function(tmpl) {
+				self.$filePickerTemplate = $(tmpl);
+				self.$listTmpl = self.$filePickerTemplate.find('.filelist li:first-child').detach();
+				defer.resolve(self.$filePickerTemplate);
+			})
+			.fail(function() {
+				defer.reject();
+			});
 		} else {
-			return $(element).val();
+			defer.resolve(this.$filePickerTemplate);
 		}
+		return defer.promise();
 	},
-
-	prompt_ok_handler: function(callback, dialog_id) {
-		$(dialog_id).dialog('close');
-		if (callback !== undefined) { callback($(dialog_id + " input#oc-dialog-prompt-input").val()) };
-	},
-
-	form_ok_handler: function(callback, dialog_id) {
-		if (callback !== undefined) {
-			var valuelist = [];
-			$(dialog_id + ' input, ' + dialog_id + ' select').each(function(index, element) {
-				valuelist[index] = { name: $(element).attr('name'), value: OCdialogs.determineValue(element) };
+	_getMessageTemplate: function() {
+		var defer = $.Deferred();
+		if(!this.$messageTemplate) {
+			var self = this;
+			$.get(OC.filePath('core', 'templates', 'message.html'), function(tmpl) {
+				self.$messageTemplate = $(tmpl);
+				defer.resolve(self.$messageTemplate);
+			})
+			.fail(function() {
+				defer.reject();
 			});
-			$(dialog_id).dialog('close');
-			callback(valuelist);
 		} else {
-			$(dialog_id).dialog('close');
+			defer.resolve(this.$messageTemplate);
 		}
+		return defer.promise();
 	},
+	_getFileList: function(dir, mimeType) {
+		return $.getJSON(
+			OC.filePath('files', 'ajax', 'rawlist.php'),
+			{dir: dir, mimetype: mimeType}
+		);
+	},
+	_determineValue: function(element) {
+		if ( $(element).attr('type') === 'checkbox' ) {
+			return element.checked;
+		} else {
+			return $(element).val();
+		}
+	},
+
 	/**
 	 * fills the filepicker with files
 	*/
-	fillFilePicker:function(request, dialog_content_id) {
-		var template_content = '<img src="*MIMETYPEICON*" style="margin: 2px 1em 0 4px;"><span class="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div>';
-		var template = '<div data-entryname="*ENTRYNAME*" data-dcid="' + escapeHTML(dialog_content_id) + '" data="*ENTRYTYPE*">*CONTENT*</div>';
-		var files = '';
+	_fillFilePicker:function(dir) {
 		var dirs = [];
 		var others = [];
-		$.each(request.data, function(index, file) {
-			if (file.type === 'dir') {
-				dirs.push(file);
-			} else {
-				others.push(file);
-			}
-		});
-		var sorted = dirs.concat(others);
-		for (var i = 0; i < sorted.length; i++) {
-			files_content = template_content.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon);
-			files += template.replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)).replace('*CONTENT*', files_content);
-		}
+		var self = this;
+		this.$filelist.empty().addClass('loading');
+		this.$filePicker.data('path', dir);
+		$.when(this._getFileList(dir, this.$filePicker.data('mimetype'))).then(function(response) {
+			$.each(response.data, function(index, file) {
+				if (file.type === 'dir') {
+					dirs.push(file);
+				} else {
+					others.push(file);
+				}
+			});
 
-		$(dialog_content_id + ' #filelist').html(files);
-		$('#filelist div').click(function() {
-			OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id);
-		});
+			self._fillSlug();
+			var sorted = dirs.concat(others);
 
-		$(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
-	},
-	/**
-	 * fills the tree list with directories
-	*/
-	fillTreeList: function(request, dialog_id) {
-		var template = '<option value="*COUNT*">*NAME*</option>';
-		var paths = '<option value="0">' + escapeHTML($(dialog_id).data('path')) + '</option>';
-		$.each(request.data, function(index, file) {
-			paths += template.replace('*COUNT*', index).replace('*NAME*', escapeHTML(file.name));
-		});
+			$.each(sorted, function(idx, entry) {
+				$li = self.$listTmpl.octemplate({
+					type: entry.type,
+					dir: dir,
+					filename: entry.name,
+					date: OC.mtime2date(entry.mtime)
+				});
+				$li.find('img').attr('src', entry.mimetype_icon);
+				self.$filelist.append($li);
+			});
 
-		$(dialog_id + ' #dirtree').html(paths);
+			self.$filelist.removeClass('loading');
+		});
 	},
 	/**
-	 * handle selection made in the tree list
+	 * fills the tree list with directories
 	*/
-	handleTreeListSelect:function(event) {
-		if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it
-			$(event.data.dcid).data('path', $("option:selected", this).html());
-		} else {
-			$(event.data.dcid).data('path', $(event.data.dcid).data('path') + $("option:selected", this).html() + '/');
+	_fillSlug: function() {
+		this.$dirTree.empty();
+		var self = this
+		var path = this.$filePicker.data('path');
+		var $template = $('<span data-dir="{dir}">{name}</span>');
+		if(path) {
+			var paths = path.split('/');
+			$.each(paths, function(index, dir) {
+				var dir = paths.pop();
+				if(dir === '') {
+					return false;
+				}
+				self.$dirTree.prepend($template.octemplate({
+					dir: paths.join('/') + '/' + dir,
+					name: dir
+				}));
+			});
 		}
-		$(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible');
-		$.getJSON(
-			OC.filePath('files', 'ajax', 'rawlist.php'),
-			{
-				dir: $(event.data.dcid).data('path'),
-				mimetype: $(event.data.dcid).data('mimetype')
-			},
-			function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
-		);
-		$.getJSON(
-			OC.filePath('files', 'ajax', 'rawlist.php'),
-			{
-				dir: $(event.data.dcid).data('path'),
-				mimetype: "httpd/unix-directory"
-			},
-			function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
-		);
+		$template.octemplate({
+			dir: '',
+			name: '&nbsp;&nbsp;&nbsp;&nbsp;' // Ugly but works ;)
+		}, {escapeFunction: null}).addClass('home svg').prependTo(this.$dirTree);
 	},
 	/**
-	 * go one directory up
+	 * handle selection made in the tree list
 	*/
-	filepickerDirUp:function(event) {
-		var old_path = $(event.data.dcid).data('path');
-		if ( old_path !== "/") {
-			var splitted_path = old_path.split("/");
-			var new_path = ""
-			for (var i = 0; i < splitted_path.length - 2; i++) {
-				new_path += splitted_path[i] + "/"
-			}
-			$(event.data.dcid).data('path', new_path);
-			$.getJSON(
-				OC.filePath('files', 'ajax', 'rawlist.php'),
-				{
-					dir: $(event.data.dcid).data('path'),
-					mimetype: $(event.data.dcid).data('mimetype')
-				},
-				function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) }
-			);
-			$.getJSON(
-				OC.filePath('files', 'ajax', 'rawlist.php'),
-				{
-					dir: $(event.data.dcid).data('path'),
-					mimetype: "httpd/unix-directory"
-				},
-				function(request) { OCdialogs.fillTreeList(request, event.data.dcid) }
-			);
-		}
+	_handleTreeListSelect:function(event) {
+		var self = event.data;
+		var dir = $(event.target).data('dir');
+		self._fillFilePicker(dir);
 	},
 	/**
 	 * handle clicks made in the filepicker
 	*/
-	handlePickerClick:function(element, name, dialog_content_id) {
-		if ( $(element).attr('data') === 'file' ){
-			if ( $(dialog_content_id).data('multiselect') !== true) {
-				$(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected');
+	_handlePickerClick:function(event, $element) {
+		if ($element.data('type') === 'file') {
+			if (this.$filePicker.data('multiselect') !== true || !event.ctrlKey) {
+				this.$filelist.find('.filepicker_element_selected').removeClass('filepicker_element_selected');
 			}
-			$(element).toggleClass('filepicker_element_selected');
+			$element.toggleClass('filepicker_element_selected');
 			return;
-		} else if ( $(element).attr('data') === 'dir' ) {
-			var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' );
-			$(dialog_content_id).data('path', datapath);
-			$(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible');
-			$.getJSON(
-				OC.filePath('files', 'ajax', 'rawlist.php'),
-				{
-					dir: datapath,
-					mimetype: $(dialog_content_id).data('mimetype')
-				},
-				function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) }
-			);
-			$.getJSON(
-				OC.filePath('files', 'ajax', 'rawlist.php'),
-				{
-					dir: datapath,
-					mimetype: "httpd/unix-directory"
-				},
-				function(request) { OCdialogs.fillTreeList(request, dialog_content_id) }
-			);
+		} else if ( $element.data('type') === 'dir' ) {
+			this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname'))
 		}
 	}
 };
diff --git a/core/js/octemplate.js b/core/js/octemplate.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69c6cc56e066fed3a03c3054fdfa040da2300c0
--- /dev/null
+++ b/core/js/octemplate.js
@@ -0,0 +1,101 @@
+/**
+ * jQuery plugin for micro templates
+ *
+ * Strings are automatically escaped, but that can be disabled by setting escapeFunction to null.
+ *
+ * Usage examples:
+ *
+ *	var htmlStr = '<p>Bake, uncovered, until the {greasystuff} is melted and the {pasta} is heated through, about {min} minutes.</p>'
+ *	$(htmlStr).octemplate({greasystuff: 'cheese', pasta: 'macaroni', min: 10});
+ *
+ * 	var htmlStr = '<p>Welcome back {user}</p>';
+ *	$(htmlStr).octemplate({user: 'John Q. Public'}, {escapeFunction: null});
+ *
+ * Be aware that the target string must be wrapped in an HTML element for the plugin to work. The following won't work:
+ * 
+ *      var textStr = 'Welcome back {user}';
+ *      $(textStr).octemplate({user: 'John Q. Public'});
+ *
+ * For anything larger than one-liners, you can use a simple $.get() ajax request to get the template,
+ * or you can embed them it the page using the text/template type:
+ *
+ * <script id="contactListItemTemplate" type="text/template">
+ *	<tr class="contact" data-id="{id}">
+ *		<td class="name">
+ *			<input type="checkbox" name="id" value="{id}" /><span class="nametext">{name}</span>
+ *		</td>
+ *		<td class="email">
+ *			<a href="mailto:{email}">{email}</a>
+ *		</td>
+ *		<td class="phone">{phone}</td>
+ *	</tr>
+ * </script>
+ *
+ * var $tmpl = $('#contactListItemTemplate');
+ * var contacts = // fetched in some ajax call
+ *
+ * $.each(contacts, function(idx, contact) {
+ * 		$contactList.append(
+ * 			$tmpl.octemplate({
+ * 				id: contact.getId(),
+ * 				name: contact.getDisplayName(),
+ * 				email: contact.getPreferredEmail(),
+ * 				phone: contact.getPreferredPhone(),
+ * 			});
+ * 		);
+ * });
+ */
+(function( $ ) {
+	/**
+	* Object Template
+	* Inspired by micro templating done by e.g. underscore.js
+	*/
+	var Template = {
+		init: function(vars, options, elem) {
+			// Mix in the passed in options with the default options
+			this.vars = vars;
+			this.options = $.extend({},this.options,options);
+
+			this.elem = elem;
+			var self = this;
+
+			if(typeof this.options.escapeFunction === 'function') {
+				for (var key = 0; key < this.vars.length; key++) {
+					if(typeof this.vars[key] === 'string') {
+						this.vars[key] = self.options.escapeFunction(this.vars[key]);
+					}
+				}
+			}
+
+			var _html = this._build(this.vars);
+			return $(_html);
+		},
+		// From stackoverflow.com/questions/1408289/best-way-to-do-variable-interpolation-in-javascript
+		_build: function(o){
+			var data = this.elem.attr('type') === 'text/template' ? this.elem.html() : outerHTML(this.elem.get(0));
+			try {
+				return data.replace(/{([^{}]*)}/g,
+					function (a, b) {
+						var r = o[b];
+						return typeof r === 'string' || typeof r === 'number' ? r : a;
+					}
+				);
+			} catch(e) {
+				console.error(e, 'data:', data)
+			}
+		},
+		options: {
+			escapeFunction: function(str) {return $('<i></i>').text(str).html();}
+		}
+	};
+
+	$.fn.octemplate = function(vars, options) {
+		var vars = vars ? vars : {};
+		if(this.length) {
+			var _template = Object.create(Template);
+			return _template.init(vars, options, this);
+		}
+	};
+
+})( jQuery );
+
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index f75d807170906587dcd940bfc9a2ac6e8cc85829..8bd4429338a339d7e9f1ddfb6a5fe75a1169b574 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -30,7 +30,7 @@
 "October" => "تشرين الاول",
 "November" => "تشرين الثاني",
 "December" => "كانون الاول",
-"Settings" => "تعديلات",
+"Settings" => "إعدادات",
 "seconds ago" => "منذ ثواني",
 "1 minute ago" => "منذ دقيقة",
 "{minutes} minutes ago" => "{minutes} منذ دقائق",
@@ -46,8 +46,8 @@
 "years ago" => "سنة مضت",
 "Choose" => "اختيار",
 "Cancel" => "الغاء",
-"No" => "لا",
 "Yes" => "نعم",
+"No" => "لا",
 "Ok" => "موافق",
 "The object type is not specified." => "نوع العنصر غير محدد.",
 "Error" => "خطأ",
@@ -63,7 +63,7 @@
 "Share with" => "شارك مع",
 "Share with link" => "شارك مع رابط",
 "Password protect" => "حماية كلمة السر",
-"Password" => "كلمة السر",
+"Password" => "كلمة المرور",
 "Email link to person" => "ارسل الرابط بالبريد الى صديق",
 "Send" => "أرسل",
 "Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
@@ -89,23 +89,21 @@
 "ownCloud password reset" => "إعادة تعيين كلمة سر ownCloud",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-"Reset email send." => "إعادة إرسال البريد الإلكتروني.",
-"Request failed!" => "فشل الطلب",
 "Username" => "إسم المستخدم",
 "Request reset" => "طلب تعديل",
 "Your password was reset" => "لقد تم تعديل كلمة السر",
 "To login page" => "الى صفحة الدخول",
-"New password" => "كلمة سر جديدة",
+"New password" => "كلمات سر جديدة",
 "Reset password" => "تعديل كلمة السر",
-"Personal" => "خصوصيات",
-"Users" => "المستخدم",
+"Personal" => "شخصي",
+"Users" => "المستخدمين",
 "Apps" => "التطبيقات",
-"Admin" => "مستخدم رئيسي",
+"Admin" => "المدير",
 "Help" => "المساعدة",
 "Access forbidden" => "التوصّل محظور",
 "Cloud not found" => "لم يتم إيجاد",
 "Edit categories" => "عدل الفئات",
-"Add" => "أدخل",
+"Add" => "اضف",
 "Security Warning" => "تحذير أمان",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Please update your PHP installation to use ownCloud securely.",
@@ -114,7 +112,7 @@
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
 "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>." => "للحصول على معلومات عن كيفية اعداد الخادم الخاص بك , يرجى زيارة الرابط  التالي  <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
-"Advanced" => "خيارات متقدمة",
+"Advanced" => "تعديلات متقدمه",
 "Data folder" => "مجلد المعلومات",
 "Configure the database" => "أسس قاعدة البيانات",
 "will be used" => "سيتم استخدمه",
@@ -124,7 +122,7 @@
 "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/bg_BG.php b/core/l10n/bg_BG.php
index dadb570d93e161f2f0934c852aafeb617be85b5a..6c04907e15b1b182140fd560f345f00f7c92f38d 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -1,4 +1,24 @@
 <?php $TRANSLATIONS = array(
+"No categories selected for deletion." => "Няма избрани категории за изтриване",
+"Sunday" => "Неделя",
+"Monday" => "Понеделник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Сряда",
+"Thursday" => "Четвъртък",
+"Friday" => "Петък",
+"Saturday" => "Събота",
+"January" => "Януари",
+"February" => "Февруари",
+"March" => "Март",
+"April" => "Април",
+"May" => "Май",
+"June" => "Юни",
+"July" => "Юли",
+"August" => "Август",
+"September" => "Септември",
+"October" => "Октомври",
+"November" => "Ноември",
+"December" => "Декември",
 "Settings" => "Настройки",
 "seconds ago" => "преди секунди",
 "1 minute ago" => "преди 1 минута",
@@ -9,15 +29,44 @@
 "last year" => "последната година",
 "years ago" => "последните години",
 "Cancel" => "Отказ",
+"Yes" => "Да",
+"No" => "Не",
+"Ok" => "Добре",
 "Error" => "Грешка",
 "Share" => "Споделяне",
+"Share with" => "Споделено с",
 "Password" => "Парола",
+"create" => "създаване",
+"You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
+"Username" => "Потребител",
+"Request reset" => "Нулиране на заявка",
+"Your password was reset" => "Вашата парола е нулирана",
 "New password" => "Нова парола",
+"Reset password" => "Нулиране на парола",
 "Personal" => "Лични",
 "Users" => "Потребители",
 "Apps" => "Приложения",
 "Admin" => "Админ",
 "Help" => "Помощ",
+"Access forbidden" => "Достъпът е забранен",
+"Cloud not found" => "облакът не намерен",
+"Edit categories" => "Редактиране на категориите",
 "Add" => "Добавяне",
-"web services under your control" => "уеб услуги под Ваш контрол"
+"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
+"Advanced" => "Разширено",
+"Data folder" => "Директория за данни",
+"Configure the database" => "Конфигуриране на базата",
+"will be used" => "ще се ползва",
+"Database user" => "Потребител за базата",
+"Database password" => "Парола за базата",
+"Database name" => "Име на базата",
+"Database host" => "Хост за базата",
+"Finish setup" => "Завършване на настройките",
+"web services under your control" => "уеб услуги под Ваш контрол",
+"Log out" => "Изход",
+"Lost your password?" => "Забравена парола?",
+"remember" => "запомни",
+"Log in" => "Вход",
+"prev" => "пред.",
+"next" => "следващо"
 );
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 686ebdf9af1a74091a9f72bac93bccbf628f7135..218bbce04aa2fff3900d8f754c5b6147826cd148 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -8,13 +8,13 @@
 "Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।",
 "%s ID not provided." => "%s ID প্রদান করা হয় নি।",
 "Error adding %s to favorites." => "প্রিয়তে %s যোগ করতে সমস্যা দেখা দিয়েছে।",
-"No categories selected for deletion." => "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি ।",
+"No categories selected for deletion." => "মুছে ফেলার জন্য কনো ক্যাটেগরি নির্বাচন করা হয় নি।",
 "Error removing %s from favorites." => "প্রিয় থেকে %s সরিয়ে ফেলতে সমস্যা দেখা দিয়েছে।",
 "Sunday" => "রবিবার",
 "Monday" => "সোমবার",
 "Tuesday" => "মঙ্গলবার",
 "Wednesday" => "বুধবার",
-"Thursday" => "বৃহষ্পতিবার",
+"Thursday" => "বৃহস্পতিবার",
 "Friday" => "শুক্রবার",
 "Saturday" => "শনিবার",
 "January" => "জানুয়ারি",
@@ -31,22 +31,22 @@
 "December" => "ডিসেম্বর",
 "Settings" => "নিয়ামকসমূহ",
 "seconds ago" => "সেকেন্ড পূর্বে",
-"1 minute ago" => "1 মিনিট পূর্বে",
+"1 minute ago" => "১ মিনিট পূর্বে",
 "{minutes} minutes ago" => "{minutes} মিনিট পূর্বে",
 "1 hour ago" => "1 ঘন্টা পূর্বে",
 "{hours} hours ago" => "{hours} ঘন্টা পূর্বে",
 "today" => "আজ",
 "yesterday" => "গতকাল",
 "{days} days ago" => "{days} দিন পূর্বে",
-"last month" => "গতমাস",
+"last month" => "গত মাস",
 "{months} months ago" => "{months} মাস পূর্বে",
 "months ago" => "মাস পূর্বে",
 "last year" => "গত বছর",
 "years ago" => "বছর পূর্বে",
 "Choose" => "বেছে নিন",
 "Cancel" => "বাতির",
-"No" => "না",
 "Yes" => "হ্যাঁ",
+"No" => "না",
 "Ok" => "তথাস্তু",
 "The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
 "Error" => "সমস্যা",
@@ -71,7 +71,7 @@
 "No people found" => "কোন ব্যক্তি খুঁজে পাওয়া গেল না",
 "Resharing is not allowed" => "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
 "Shared in {item} with {user}" => "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
-"Unshare" => "ভাগাভাগি বাতিল কর",
+"Unshare" => "ভাগাভাগি বাতিল ",
 "can edit" => "সম্পাদনা করতে পারবেন",
 "access control" => "অধিগম্যতা নিয়ন্ত্রণ",
 "create" => "তৈরী করুন",
@@ -86,8 +86,6 @@
 "ownCloud password reset" => "ownCloud কূটশব্দ পূনঃনির্ধারণ",
 "Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
 "You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-"Reset email send." => "পূনঃনির্ধারণ ই-মেইল পাঠানো হয়েছে।",
-"Request failed!" => "অনুরোধ ব্যর্থ !",
 "Username" => "ব্যবহারকারী",
 "Request reset" => "অনুরোধ পূনঃনির্ধারণ",
 "Your password was reset" => "আপনার কূটশব্দটি  পূনঃনির্ধারণ  করা হয়েছে",
@@ -96,7 +94,7 @@
 "Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর",
 "Personal" => "ব্যক্তিগত",
 "Users" => "ব্যবহারকারী",
-"Apps" => "অ্যাপস",
+"Apps" => "অ্যাপ",
 "Admin" => "প্রশাসন",
 "Help" => "সহায়িকা",
 "Access forbidden" => "অধিগমনের অনুমতি নেই",
@@ -115,7 +113,7 @@
 "Database tablespace" => "ডাটাবেজ টেবলস্পেস",
 "Database host" => "ডাটাবেজ হোস্ট",
 "Finish setup" => "সেটআপ সুসম্পন্ন কর",
-"web services under your control" => "ওয়েব সার্ভিসের নিয়ন্ত্রণ আপনার হাতের মুঠোয়",
+"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "Log out" => "প্রস্থান",
 "Lost your password?" => "কূটশব্দ হারিয়েছেন?",
 "remember" => "মনে রাখ",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index acf617034fe920a717fa5c1601c0083ff825a70f..dad970d41794cddefb1eea32eba939abe6293952 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -30,7 +30,7 @@
 "October" => "Octubre",
 "November" => "Novembre",
 "December" => "Desembre",
-"Settings" => "Arranjament",
+"Settings" => "Configuració",
 "seconds ago" => "segons enrere",
 "1 minute ago" => "fa 1 minut",
 "{minutes} minutes ago" => "fa {minutes} minuts",
@@ -46,8 +46,9 @@
 "years ago" => "anys enrere",
 "Choose" => "Escull",
 "Cancel" => "Cancel·la",
-"No" => "No",
+"Error loading file picker template" => "Error en carregar la plantilla del seleccionador de fitxers",
 "Yes" => "Sí",
+"No" => "No",
 "Ok" => "D'acord",
 "The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
 "Error" => "Error",
@@ -66,8 +67,8 @@
 "Password" => "Contrasenya",
 "Email link to person" => "Enllaç per correu electrónic amb la persona",
 "Send" => "Envia",
-"Set expiration date" => "Estableix la data d'expiració",
-"Expiration date" => "Data d'expiració",
+"Set expiration date" => "Estableix la data de venciment",
+"Expiration date" => "Data de venciment",
 "Share via email:" => "Comparteix per correu electrònic",
 "No people found" => "No s'ha trobat ningú",
 "Resharing is not allowed" => "No es permet compartir de nou",
@@ -80,17 +81,17 @@
 "delete" => "elimina",
 "share" => "comparteix",
 "Password protected" => "Protegeix amb contrasenya",
-"Error unsetting expiration date" => "Error en eliminar la data d'expiració",
-"Error setting expiration date" => "Error en establir la data d'expiració",
+"Error unsetting expiration date" => "Error en eliminar la data de venciment",
+"Error setting expiration date" => "Error en establir la data de venciment",
 "Sending ..." => "Enviant...",
 "Email sent" => "El correu electrónic s'ha enviat",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
 "ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {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'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
+"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.",
-"Reset email send." => "S'ha enviat el correu reinicialització",
-"Request failed!" => "El requeriment ha fallat!",
 "Username" => "Nom d'usuari",
 "Request reset" => "Sol·licita reinicialització",
 "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
@@ -100,7 +101,7 @@
 "Personal" => "Personal",
 "Users" => "Usuaris",
 "Apps" => "Aplicacions",
-"Admin" => "Administrador",
+"Admin" => "Administració",
 "Help" => "Ajuda",
 "Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
@@ -125,6 +126,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index eb70ac3e096ea723945562ee81cc24fa5e1ffa57..06cf7c214be0f0811a15e8f493496755b58c853c 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -39,15 +39,15 @@
 "today" => "dnes",
 "yesterday" => "včera",
 "{days} days ago" => "před {days} dny",
-"last month" => "minulý mesíc",
+"last month" => "minulý měsíc",
 "{months} months ago" => "před {months} měsíci",
 "months ago" => "před měsíci",
 "last year" => "minulý rok",
 "years ago" => "před lety",
 "Choose" => "Vybrat",
 "Cancel" => "Zrušit",
-"No" => "Ne",
 "Yes" => "Ano",
+"No" => "Ne",
 "Ok" => "Ok",
 "The object type is not specified." => "Není určen typ objektu.",
 "Error" => "Chyba",
@@ -82,15 +82,15 @@
 "Password protected" => "Chráněno heslem",
 "Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
 "Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
-"Sending ..." => "Odesílám...",
+"Sending ..." => "Odesílám ...",
 "Email sent" => "E-mail odeslán",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
 "ownCloud password reset" => "Obnovení hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {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 ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.",
+"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.",
-"Reset email send." => "Obnovovací e-mail odeslán.",
-"Request failed!" => "Požadavek selhal.",
 "Username" => "Uživatelské jméno",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -124,7 +124,8 @@
 "Database tablespace" => "Tabulkový prostor databáze",
 "Database host" => "Hostitel databáze",
 "Finish setup" => "Dokončit nastavení",
-"web services under your control" => "webové služby pod Vaší kontrolou",
+"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.",
 "If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..cdb2576d4576a332f4bb01abb11eeda292eb8cb0
--- /dev/null
+++ b/core/l10n/cy_GB.php
@@ -0,0 +1,140 @@
+<?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",
+"Object type not provided." => "Math o wrthrych heb ei ddarparu.",
+"%s ID not provided." => "%s ID heb ei ddarparu.",
+"Error adding %s to favorites." => "Gwall wrth ychwanegu %s at ffefrynnau.",
+"No categories selected for deletion." => "Ni ddewiswyd categorïau i'w dileu.",
+"Error removing %s from favorites." => "Gwall wrth dynnu %s o ffefrynnau.",
+"Sunday" => "Sul",
+"Monday" => "Llun",
+"Tuesday" => "Mawrth",
+"Wednesday" => "Mercher",
+"Thursday" => "Iau",
+"Friday" => "Gwener",
+"Saturday" => "Sadwrn",
+"January" => "Ionawr",
+"February" => "Chwefror",
+"March" => "Mawrth",
+"April" => "Ebrill",
+"May" => "Mai",
+"June" => "Mehefin",
+"July" => "Gorffennaf",
+"August" => "Awst",
+"September" => "Medi",
+"October" => "Hydref",
+"November" => "Tachwedd",
+"December" => "Rhagfyr",
+"Settings" => "Gosodiadau",
+"seconds ago" => "eiliad yn ôl",
+"1 minute ago" => "1 munud yn ôl",
+"{minutes} minutes ago" => "{minutes} munud yn ôl",
+"1 hour ago" => "1 awr yn ôl",
+"{hours} hours ago" => "{hours} awr yn ôl",
+"today" => "heddiw",
+"yesterday" => "ddoe",
+"{days} days ago" => "{days} diwrnod yn ôl",
+"last month" => "mis diwethaf",
+"{months} months ago" => "{months} mis yn ôl",
+"months ago" => "misoedd yn ôl",
+"last year" => "y llynedd",
+"years ago" => "blwyddyn yn ôl",
+"Choose" => "Dewisiwch",
+"Cancel" => "Diddymu",
+"Yes" => "Ie",
+"No" => "Na",
+"Ok" => "Iawn",
+"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
+"Error" => "Gwall",
+"The app name is not specified." => "Nid yw enw'r pecyn wedi cael ei nodi.",
+"The required file {file} is not installed!" => "Nid yw'r ffeil ofynnol {file} wedi ei gosod!",
+"Shared" => "Rhannwyd",
+"Share" => "Rhannu",
+"Error while sharing" => "Gwall wrth rannu",
+"Error while unsharing" => "Gwall wrth ddad-rannu",
+"Error while changing permissions" => "Gwall wrth newid caniatâd",
+"Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+"Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
+"Share with" => "Rhannu gyda",
+"Share with link" => "Dolen ar gyfer rhannu",
+"Password protect" => "Diogelu cyfrinair",
+"Password" => "Cyfrinair",
+"Email link to person" => "E-bostio dolen at berson",
+"Send" => "Anfon",
+"Set expiration date" => "Gosod dyddiad dod i ben",
+"Expiration date" => "Dyddiad dod i ben",
+"Share via email:" => "Rhannu drwy e-bost:",
+"No people found" => "Heb ganfod pobl",
+"Resharing is not allowed" => "Does dim hawl ail-rannu",
+"Shared in {item} with {user}" => "Rhannwyd yn {item} â {user}",
+"Unshare" => "Dad-rannu",
+"can edit" => "yn gallu golygu",
+"access control" => "rheolaeth mynediad",
+"create" => "creu",
+"update" => "diweddaru",
+"delete" => "dileu",
+"share" => "rhannu",
+"Password protected" => "Diogelwyd â chyfrinair",
+"Error unsetting expiration date" => "Gwall wrth ddad-osod dyddiad dod i ben",
+"Error setting expiration date" => "Gwall wrth osod dyddiad dod i ben",
+"Sending ..." => "Yn anfon ...",
+"Email sent" => "Anfonwyd yr e-bost",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
+"ownCloud password reset" => "ailosod cyfrinair ownCloud",
+"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {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 ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost.",
+"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+"Username" => "Enw defnyddiwr",
+"Request reset" => "Gwneud cais i ailosod",
+"Your password was reset" => "Ailosodwyd eich cyfrinair",
+"To login page" => "I'r dudalen mewngofnodi",
+"New password" => "Cyfrinair newydd",
+"Reset password" => "Ailosod cyfrinair",
+"Personal" => "Personol",
+"Users" => "Defnyddwyr",
+"Apps" => "Pecynnau",
+"Admin" => "Gweinyddu",
+"Help" => "Cymorth",
+"Access forbidden" => "Mynediad wedi'i wahardd",
+"Cloud not found" => "Methwyd canfod cwmwl",
+"Edit categories" => "Golygu categorïau",
+"Add" => "Ychwanegu",
+"Security Warning" => "Rhybudd Diogelwch",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+"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>." => "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ddogfennaeth</a>.",
+"Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
+"Advanced" => "Uwch",
+"Data folder" => "Plygell data",
+"Configure the database" => "Cyflunio'r gronfa ddata",
+"will be used" => "ddefnyddir",
+"Database user" => "Defnyddiwr cronfa ddata",
+"Database password" => "Cyfrinair cronfa ddata",
+"Database name" => "Enw cronfa ddata",
+"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!",
+"If you did not change your password recently, your account may be compromised!" => "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!",
+"Please change your password to secure your account again." => "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto.",
+"Lost your password?" => "Wedi colli'ch cyfrinair?",
+"remember" => "cofio",
+"Log in" => "Mewngofnodi",
+"Alternative Logins" => "Mewngofnodiadau Amgen",
+"prev" => "blaenorol",
+"next" => "nesaf",
+"Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
+);
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 6650a7e1d8cca4f1d1a445f7109ac6466af482c2..4c030bbf7cc363f8e9a0b872ca5d7f6934c99849 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -45,9 +45,9 @@
 "last year" => "sidste år",
 "years ago" => "Ã¥r siden",
 "Choose" => "Vælg",
-"Cancel" => "Fortryd",
-"No" => "Nej",
+"Cancel" => "Annuller",
 "Yes" => "Ja",
+"No" => "Nej",
 "Ok" => "OK",
 "The object type is not specified." => "Objekttypen er ikke angivet.",
 "Error" => "Fejl",
@@ -88,16 +88,16 @@
 "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.",
-"Reset email send." => "Reset-mail afsendt.",
-"Request failed!" => "Anmodningen mislykkedes!",
 "Username" => "Brugernavn",
 "Request reset" => "Anmod om nulstilling",
 "Your password was reset" => "Dit kodeord blev nulstillet",
 "To login page" => "Til login-side",
 "New password" => "Nyt kodeord",
 "Reset password" => "Nulstil kodeord",
-"Personal" => "Personlig",
+"Personal" => "Personligt",
 "Users" => "Brugere",
 "Apps" => "Apps",
 "Admin" => "Admin",
@@ -125,6 +125,7 @@
 "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 3b9ac15f4e5294063aa6354bb64dc3368a015b60..62e9925b945308eb6644232aa97e17854f995d15 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -46,8 +46,8 @@
 "years ago" => "Vor Jahren",
 "Choose" => "Auswählen",
 "Cancel" => "Abbrechen",
-"No" => "Nein",
 "Yes" => "Ja",
+"No" => "Nein",
 "Ok" => "OK",
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Error" => "Fehler",
@@ -56,7 +56,7 @@
 "Shared" => "Geteilt",
 "Share" => "Teilen",
 "Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Teilung",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern der Rechte",
 "Shared with you and the group {group} by {owner}" => "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
 "Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
@@ -80,17 +80,17 @@
 "delete" => "löschen",
 "share" => "teilen",
 "Password protected" => "Durch ein Passwort geschützt",
-"Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
+"Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "Sending ..." => "Sende ...",
 "Email sent" => "E-Mail wurde verschickt",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
 "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
-"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.",
-"Request failed!" => "Die Anfrage schlug fehl!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
@@ -99,8 +99,8 @@
 "Reset password" => "Passwort zurücksetzen",
 "Personal" => "Persönlich",
 "Users" => "Benutzer",
-"Apps" => "Anwendungen",
-"Admin" => "Admin",
+"Apps" => "Apps",
+"Admin" => "Administration",
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud nicht gefunden",
@@ -108,11 +108,11 @@
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitswarnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use ownCloud securely." => "Bitte bringe deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.",
+"Please update your PHP installation to use ownCloud securely." => "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Konten  zu übernehmen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"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>." => "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+"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>." => "Bitte ließ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Du Deinen Server konfigurierst.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -124,7 +124,8 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"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!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index d6a8b1405e58e10bba6269e8ac1a962264e86c29..ea8a4e5adc3d8e4b7405a1254c56820c8c1fe036 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -46,8 +46,9 @@
 "years ago" => "Vor Jahren",
 "Choose" => "Auswählen",
 "Cancel" => "Abbrechen",
-"No" => "Nein",
+"Error loading file picker template" => "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten.",
 "Yes" => "Ja",
+"No" => "Nein",
 "Ok" => "OK",
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Error" => "Fehler",
@@ -56,7 +57,7 @@
 "Shared" => "Geteilt",
 "Share" => "Teilen",
 "Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler bei der Aufhebung der Teilung",
+"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler bei der Änderung der Rechte",
 "Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
@@ -88,23 +89,23 @@
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {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 ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
+"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.",
-"Reset email send." => "Eine E-Mail zum Zurücksetzen des Passworts wurde gesendet.",
-"Request failed!" => "Die Anfrage schlug fehl!",
 "Username" => "Benutzername",
-"Request reset" => "Zurücksetzung beantragen",
+"Request reset" => "Zurücksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
 "Reset password" => "Passwort zurücksetzen",
 "Personal" => "Persönlich",
 "Users" => "Benutzer",
-"Apps" => "Anwendungen",
-"Admin" => "Admin",
+"Apps" => "Apps",
+"Admin" => "Administrator",
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
-"Edit categories" => "Kategorien bearbeiten",
+"Edit categories" => "Kategorien ändern",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
@@ -125,8 +126,9 @@
 "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.",
+"Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
 "Lost your password?" => "Passwort vergessen?",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 4fc5b4aa86ed8d0b4714362c6b6da3bf9446a7cc..11295105e311fcbbdd596de21c4d23c7cea9d3ee 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -44,11 +44,11 @@
 "months ago" => "μήνες πριν",
 "last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
-"Ok" => "Οκ",
-"Cancel" => "Άκυρο",
 "Choose" => "Επιλέξτε",
+"Cancel" => "Άκυρο",
 "Yes" => "Ναι",
 "No" => "Όχι",
+"Ok" => "Οκ",
 "The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
 "Error" => "Σφάλμα",
 "The app name is not specified." => "Δεν καθορίστηκε το όνομα της εφαρμογής.",
@@ -88,10 +88,10 @@
 "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 ." => "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή ",
+"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." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-"Reset email send." => "Η επαναφορά του email στάλθηκε.",
-"Request failed!" => "Η αίτηση απέτυχε!",
-"Username" => "Όνομα Χρήστη",
+"Username" => "Όνομα χρήστη",
 "Request reset" => "Επαναφορά αίτησης",
 "Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
 "To login page" => "Σελίδα εισόδου",
@@ -124,7 +124,7 @@
 "Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
+"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/en@pirate.php b/core/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..981d9a1ca0f326481cfa383fd15b3a7696dfe001
--- /dev/null
+++ b/core/l10n/en@pirate.php
@@ -0,0 +1,5 @@
+<?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 f2297bd3d97394d759367736bb2508ed4206c8a4..72cdf90c61e8d1bfaeb0a2b520581f1f7af91a07 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -45,8 +45,8 @@
 "years ago" => "jaroj antaÅ­e",
 "Choose" => "Elekti",
 "Cancel" => "Nuligi",
-"No" => "Ne",
 "Yes" => "Jes",
+"No" => "Ne",
 "Ok" => "Akcepti",
 "The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
 "Error" => "Eraro",
@@ -85,7 +85,6 @@
 "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}",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-"Request failed!" => "Peto malsukcesis!",
 "Username" => "Uzantonomo",
 "Request reset" => "Peti rekomencigon",
 "Your password was reset" => "Via pasvorto rekomencis",
@@ -114,7 +113,7 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
-"web services under your control" => "TTT-servoj sub via kontrolo",
+"web services under your control" => "TTT-servoj regataj de vi",
 "Log out" => "Elsaluti",
 "If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!",
 "Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index e64858c4b11539a98a51f3fdaead537410a38d78..4b8d5c7b18903d6d4640d9588c85d816ed4e4ac4 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,13 +1,13 @@
 <?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",
-"Category type not provided." => "Tipo de categoria no proporcionado.",
+"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.",
+"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" => "Esta categoria ya existe: %s",
-"Object type not provided." => "ipo de objeto no proporcionado.",
-"%s ID not provided." => "%s ID no proporcionado.",
+"This category already exists: %s" => "Ya existe esta categoría: %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.",
 "No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
 "Error removing %s from favorites." => "Error eliminando %s de los favoritos.",
@@ -39,20 +39,21 @@
 "today" => "hoy",
 "yesterday" => "ayer",
 "{days} days ago" => "hace {days} días",
-"last month" => "mes pasado",
+"last month" => "el mes pasado",
 "{months} months ago" => "Hace {months} meses",
 "months ago" => "hace meses",
-"last year" => "año pasado",
+"last year" => "el año pasado",
 "years ago" => "hace años",
 "Choose" => "Seleccionar",
 "Cancel" => "Cancelar",
-"No" => "No",
+"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos",
 "Yes" => "Sí",
+"No" => "No",
 "Ok" => "Aceptar",
-"The object type is not specified." => "El tipo de objeto no se ha especificado.",
-"Error" => "Fallo",
-"The app name is not specified." => "El nombre de la app no se ha especificado.",
-"The required file {file} is not installed!" => "El fichero  {file} requerido, no está instalado.",
+"The object type is not specified." => "No se ha especificado el tipo de objeto",
+"Error" => "Error",
+"The app name is not specified." => "No se ha especificado el nombre de la aplicación.",
+"The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
 "Error while sharing" => "Error compartiendo",
@@ -68,15 +69,15 @@
 "Send" => "Enviar",
 "Set expiration date" => "Establecer fecha de caducidad",
 "Expiration date" => "Fecha de caducidad",
-"Share via email:" => "compartido via e-mail:",
+"Share via email:" => "Compartido por correo electrónico:",
 "No people found" => "No se encontró gente",
 "Resharing is not allowed" => "No se permite compartir de nuevo",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "No compartir",
+"Unshare" => "Dejar de compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
-"update" => "modificar",
+"update" => "actualizar",
 "delete" => "eliminar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
@@ -84,36 +85,36 @@
 "Error setting expiration date" => "Error estableciendo fecha de caducidad",
 "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 este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
+"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" => "Reiniciar contraseña de ownCloud",
+"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}",
-"You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
-"Reset email send." => "Email de reconfiguración enviado.",
-"Request failed!" => "Pedido fallado!",
+"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",
 "Request reset" => "Solicitar restablecimiento",
-"Your password was reset" => "Tu contraseña se ha restablecido",
+"Your password was reset" => "Su contraseña ha sido establecida",
 "To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
 "Personal" => "Personal",
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
-"Admin" => "Administrador",
+"Admin" => "Administración",
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se ha encontrado la nube",
 "Edit categories" => "Editar categorías",
-"Add" => "Añadir",
+"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)",
-"Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud en forma segura.",
+"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 reinicio de su contraseña y tomar control de su cuenta.",
-"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 están probablemente accesibles a través de internet ya que el archivo .htaccess no está funcionando.",
+"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.",
 "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>" => "Crea una <strong>cuenta de administrador</strong>",
+"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
@@ -124,13 +125,14 @@
 "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 tu control",
+"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?" => "¿Has perdido tu contraseña?",
-"remember" => "recuérdame",
+"Lost your password?" => "¿Ha perdido su contraseña?",
+"remember" => "recordarme",
 "Log in" => "Entrar",
 "Alternative Logins" => "Nombre de usuarios alternativos",
 "prev" => "anterior",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index f17a6d9baf1b29cd8b9760752f67c3998bbe1420..38b0791b94bdce60fa678d271a88c97ca88c136f 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "Tipo de objeto no provisto. ",
 "%s ID not provided." => "%s ID no provista. ",
 "Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
-"No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
+"No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
 "Error removing %s from favorites." => "Error al remover %s de favoritos. ",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
@@ -18,23 +18,23 @@
 "Thursday" => "Jueves",
 "Friday" => "Viernes",
 "Saturday" => "Sábado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"Settings" => "Ajustes",
+"January" => "enero",
+"February" => "febrero",
+"March" => "marzo",
+"April" => "abril",
+"May" => "mayo",
+"June" => "junio",
+"July" => "julio",
+"August" => "agosto",
+"September" => "septiembre",
+"October" => "octubre",
+"November" => "noviembre",
+"December" => "diciembre",
+"Settings" => "Configuración",
 "seconds ago" => "segundos atrás",
 "1 minute ago" => "hace 1 minuto",
 "{minutes} minutes ago" => "hace {minutes} minutos",
-"1 hour ago" => "Hace 1 hora",
+"1 hour ago" => "1 hora atrás",
 "{hours} hours ago" => "{hours} horas atrás",
 "today" => "hoy",
 "yesterday" => "ayer",
@@ -46,8 +46,8 @@
 "years ago" => "años atrás",
 "Choose" => "Elegir",
 "Cancel" => "Cancelar",
-"No" => "No",
 "Yes" => "Sí",
+"No" => "No",
 "Ok" => "Aceptar",
 "The object type is not specified." => "El tipo de objeto no esta especificado. ",
 "Error" => "Error",
@@ -72,7 +72,7 @@
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "Remover compartir",
+"Unshare" => "Dejar de compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
@@ -89,18 +89,16 @@
 "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}",
 "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
-"Reset email send." => "Reiniciar envío de email.",
-"Request failed!" => "Error en el pedido!",
 "Username" => "Nombre de usuario",
 "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",
-"New password" => "Nueva contraseña",
+"New password" => "Nueva contraseña:",
 "Reset password" => "Restablecer contraseña",
 "Personal" => "Personal",
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
-"Admin" => "Administrador",
+"Admin" => "Administración",
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encontró ownCloud",
@@ -124,7 +122,7 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web sobre los que tenés control",
+"web services under your control" => "servicios web controlados por vos",
 "Log out" => "Cerrar la sesión",
 "Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index b6b6d4c9d94f3e3db78edba477a29ea468699a89..803b36e1c31fe33c21fac1677ac1f93d67d4defb 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,16 +1,16 @@
 <?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 kataloogi.",
-"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 kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s",
+"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 juba eksisteerib: %s",
+"This category already exists: %s" => "See kategooria on juba olemas: %s",
 "Object type not provided." => "Objekti tüüb puudub.",
-"%s ID not provided." => "%s ID puudub",
+"%s ID not provided." => "%s ID puudub.",
 "Error adding %s to favorites." => "Viga %s lisamisel lemmikutesse.",
 "No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
-"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest",
+"Error removing %s from favorites." => "Viga %s eemaldamisel lemmikutest.",
 "Sunday" => "Pühapäev",
 "Monday" => "Esmaspäev",
 "Tuesday" => "Teisipäev",
@@ -44,14 +44,15 @@
 "months ago" => "kuu tagasi",
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
-"Ok" => "Ok",
-"Cancel" => "Loobu",
 "Choose" => "Vali",
+"Cancel" => "Loobu",
+"Error loading file picker template" => "Viga failivalija malli laadimisel",
 "Yes" => "Jah",
 "No" => "Ei",
-"The object type is not specified." => "Objekti tüüb pole määratletud",
+"Ok" => "Ok",
+"The object type is not specified." => "Objekti tüüp pole määratletud.",
 "Error" => "Viga",
-"The app name is not specified." => "Rakenduse nimi ole määratletud",
+"The app name is not specified." => "Rakenduse nimi ole määratletud.",
 "The required file {file} is not installed!" => "Vajalikku faili {file} pole paigaldatud!",
 "Shared" => "Jagatud",
 "Share" => "Jaga",
@@ -64,7 +65,7 @@
 "Share with link" => "Jaga lingiga",
 "Password protect" => "Parooliga kaitstud",
 "Password" => "Parool",
-"Email link to person" => "Saada link isikule emailiga",
+"Email link to person" => "Saada link isikule e-postiga",
 "Send" => "Saada",
 "Set expiration date" => "Määra aegumise kuupäev",
 "Expiration date" => "Aegumise kuupäev",
@@ -82,24 +83,24 @@
 "Password protected" => "Parooliga kaitstud",
 "Error unsetting expiration date" => "Viga aegumise kuupäeva eemaldamisel",
 "Error setting expiration date" => "Viga aegumise kuupäeva määramisel",
-"Sending ..." => "Saadan ...",
-"Email sent" => "Email saadetud",
+"Sending ..." => "Saatmine ...",
+"Email sent" => "E-kiri on saadetud",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
 "ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {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 ." => "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
-"Reset email send." => "Taastamise e-kiri on saadetud.",
-"Request failed!" => "Päring ebaõnnestus!",
 "Username" => "Kasutajanimi",
 "Request reset" => "Päringu taastamine",
 "Your password was reset" => "Sinu parool on taastatud",
 "To login page" => "Sisselogimise lehele",
 "New password" => "Uus parool",
 "Reset password" => "Nulli parool",
-"Personal" => "isiklik",
+"Personal" => "Isiklik",
 "Users" => "Kasutajad",
-"Apps" => "Programmid",
+"Apps" => "Rakendused",
 "Admin" => "Admin",
 "Help" => "Abiinfo",
 "Access forbidden" => "Ligipääs on keelatud",
@@ -112,9 +113,9 @@
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvalist juhuslike numbrite generaatorit pole saadaval. Palun luba PHP-s OpenSSL laiendus.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ilma turvalise juhuslike numbrite generaatorita võib ründaja ennustada paroolivahetuse võtme ning hõivata su konto.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
-"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>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.",
+"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>." => "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>.",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Advanced" => "Lisavalikud",
+"Advanced" => "Täpsem",
 "Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
 "will be used" => "kasutatakse",
@@ -125,15 +126,16 @@
 "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!",
-"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!",
+"If you did not change your password recently, your account may be compromised!" => "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!",
 "Please change your password to secure your account again." => "Palun muuda parooli, et oma kasutajakonto uuesti turvata.",
 "Lost your password?" => "Kaotasid oma parooli?",
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
-"Alternative Logins" => "Alternatiivsed meldimised",
+"Alternative Logins" => "Alternatiivsed sisselogimisviisid",
 "prev" => "eelm",
 "next" => "järgm",
-"Updating ownCloud to version %s, this may take a while." => "Uuendan ownCloudi versioonile %s. Läheb pisut aega."
+"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
 );
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index dde2d59cbdffbbfbc6195f469f66368caa0922aa..1ec4ee8f5c4a8523aa89e9ed5b3c3cb45aa91cfa 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -46,8 +46,8 @@
 "years ago" => "urte",
 "Choose" => "Aukeratu",
 "Cancel" => "Ezeztatu",
-"No" => "Ez",
 "Yes" => "Bai",
+"No" => "Ez",
 "Ok" => "Ados",
 "The object type is not specified." => "Objetu mota ez dago zehaztuta.",
 "Error" => "Errorea",
@@ -89,8 +89,6 @@
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-"Reset email send." => "Berrezartzeko eposta bidali da.",
-"Request failed!" => "Eskariak huts egin du!",
 "Username" => "Erabiltzaile izena",
 "Request reset" => "Eskaera berrezarri da",
 "Your password was reset" => "Zure pasahitza berrezarri da",
@@ -100,7 +98,7 @@
 "Personal" => "Pertsonala",
 "Users" => "Erabiltzaileak",
 "Apps" => "Aplikazioak",
-"Admin" => "Kudeatzailea",
+"Admin" => "Admin",
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 58f201a3fef787b7f4cf17ba099190697aa081d6..fb8a312587c99b12c562d0dbe358b646d1a6fccd 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -46,15 +46,15 @@
 "years ago" => "سال‌های قبل",
 "Choose" => "انتخاب کردن",
 "Cancel" => "منصرف شدن",
-"No" => "نه",
 "Yes" => "بله",
+"No" => "نه",
 "Ok" => "قبول",
 "The object type is not specified." => "نوع شی تعیین نشده است.",
 "Error" => "خطا",
 "The app name is not specified." => "نام برنامه تعیین نشده است.",
 "The required file {file} is not installed!" => "پرونده { پرونده} درخواست شده نصب نشده است !",
 "Shared" => "اشتراک گذاشته شده",
-"Share" => "اشتراک‌گزاری",
+"Share" => "اشتراک‌گذاری",
 "Error while sharing" => "خطا درحال به اشتراک گذاشتن",
 "Error while unsharing" => "خطا درحال لغو اشتراک",
 "Error while changing permissions" => "خطا در حال تغییر مجوز",
@@ -89,22 +89,20 @@
 "ownCloud password reset" => "پسورد ابرهای شما تغییرکرد",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
 "You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-"Reset email send." => "تنظیم مجدد ایمیل را بفرستید.",
-"Request failed!" => "درخواست رد شده است !",
-"Username" => "شناسه",
+"Username" => "نام کاربری",
 "Request reset" => "درخواست دوباره سازی",
 "Your password was reset" => "گذرواژه شما تغییرکرد",
 "To login page" => "به صفحه ورود",
 "New password" => "گذرواژه جدید",
 "Reset password" => "دوباره سازی گذرواژه",
 "Personal" => "شخصی",
-"Users" => "کاربر ها",
-"Apps" => "برنامه",
+"Users" => "کاربران",
+"Apps" => "  برنامه ها",
 "Admin" => "مدیر",
-"Help" => "Ú©Ù…Ú©",
+"Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
-"Edit categories" => "ویرایش گروه ها",
+"Edit categories" => "ویرایش گروه",
 "Add" => "افزودن",
 "Security Warning" => "اخطار امنیتی",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
@@ -114,7 +112,7 @@
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
 "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>." => "برای مطلع شدن از چگونگی تنظیم سرورتان،لطفا <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">این</a> را ببینید.",
 "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Advanced" => "حرفه ای",
+"Advanced" => "پیشرفته",
 "Data folder" => "پوشه اطلاعاتی",
 "Configure the database" => "پایگاه داده برنامه ریزی شدند",
 "will be used" => "استفاده خواهد شد",
@@ -124,7 +122,7 @@
 "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/fi_FI.php b/core/l10n/fi_FI.php
index e9386cad4313fe14c9b070df0783b951c235bbf5..1f7a01e0e06950ebbc22fdfe1eeb79f66f450f64 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -9,25 +9,25 @@
 "Error adding %s to favorites." => "Virhe lisätessä kohdetta %s suosikkeihin.",
 "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
 "Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
-"Sunday" => "Sunnuntai",
-"Monday" => "Maanantai",
-"Tuesday" => "Tiistai",
-"Wednesday" => "Keskiviikko",
-"Thursday" => "Torstai",
-"Friday" => "Perjantai",
-"Saturday" => "Lauantai",
-"January" => "Tammikuu",
-"February" => "Helmikuu",
-"March" => "Maaliskuu",
-"April" => "Huhtikuu",
-"May" => "Toukokuu",
-"June" => "Kesäkuu",
-"July" => "Heinäkuu",
-"August" => "Elokuu",
-"September" => "Syyskuu",
-"October" => "Lokakuu",
-"November" => "Marraskuu",
-"December" => "Joulukuu",
+"Sunday" => "sunnuntai",
+"Monday" => "maanantai",
+"Tuesday" => "tiistai",
+"Wednesday" => "keskiviikko",
+"Thursday" => "torstai",
+"Friday" => "perjantai",
+"Saturday" => "lauantai",
+"January" => "tammikuu",
+"February" => "helmikuu",
+"March" => "maaliskuu",
+"April" => "huhtikuu",
+"May" => "toukokuu",
+"June" => "kesäkuu",
+"July" => "heinäkuu",
+"August" => "elokuu",
+"September" => "syyskuu",
+"October" => "lokakuu",
+"November" => "marraskuu",
+"December" => "joulukuu",
 "Settings" => "Asetukset",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
@@ -44,8 +44,8 @@
 "years ago" => "vuotta sitten",
 "Choose" => "Valitse",
 "Cancel" => "Peru",
-"No" => "Ei",
 "Yes" => "Kyllä",
+"No" => "Ei",
 "Ok" => "Ok",
 "Error" => "Virhe",
 "The app name is not specified." => "Sovelluksen nimeä ei ole määritelty.",
@@ -84,19 +84,18 @@
 "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
 "ownCloud password reset" => "ownCloud-salasanan nollaus",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+"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.",
-"Reset email send." => "Salasanan nollausviesti lähetetty.",
-"Request failed!" => "Pyyntö epäonnistui!",
 "Username" => "Käyttäjätunnus",
 "Request reset" => "Tilaus lähetetty",
 "Your password was reset" => "Salasanasi nollattiin",
 "To login page" => "Kirjautumissivulle",
 "New password" => "Uusi salasana",
 "Reset password" => "Palauta salasana",
-"Personal" => "Henkilökohtaiset",
+"Personal" => "Henkilökohtainen",
 "Users" => "Käyttäjät",
 "Apps" => "Sovellukset",
-"Admin" => "Hallinta",
+"Admin" => "Ylläpitäjä",
 "Help" => "Ohje",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
@@ -105,6 +104,7 @@
 "Security Warning" => "Turvallisuusvaroitus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Päivitä PHP-asennuksesi käyttääksesi ownCloudia turvallisesti.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
 "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>." => "Katso palvelimen asetuksien määrittämiseen liittyvät ohjeet <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaatiosta</a>.",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
@@ -119,6 +119,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 84c4c0abdf4c081d4addc7eee420df402d201306..b01625a887b86102fb8be013944350b1a50151f6 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "Type d'objet non spécifié.",
 "%s ID not provided." => "L'identifiant de %s n'est pas spécifié.",
 "Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
-"No categories selected for deletion." => "Aucune catégorie sélectionnée pour suppression",
+"No categories selected for deletion." => "Pas de catégorie sélectionnée pour la suppression.",
 "Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
 "Sunday" => "Dimanche",
 "Monday" => "Lundi",
@@ -46,8 +46,8 @@
 "years ago" => "il y a plusieurs années",
 "Choose" => "Choisir",
 "Cancel" => "Annuler",
-"No" => "Non",
 "Yes" => "Oui",
+"No" => "Non",
 "Ok" => "Ok",
 "The object type is not specified." => "Le type d'objet n'est pas spécifié.",
 "Error" => "Erreur",
@@ -88,23 +88,23 @@
 "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {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 ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
+"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.",
-"Reset email send." => "Mail de réinitialisation envoyé.",
-"Request failed!" => "La requête a échoué !",
 "Username" => "Nom d'utilisateur",
 "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",
 "New password" => "Nouveau mot de passe",
 "Reset password" => "Réinitialiser le mot de passe",
-"Personal" => "Personnels",
+"Personal" => "Personnel",
 "Users" => "Utilisateurs",
 "Apps" => "Applications",
 "Admin" => "Administration",
 "Help" => "Aide",
 "Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
-"Edit categories" => "Modifier les catégories",
+"Edit categories" => "Editer les catégories",
 "Add" => "Ajouter",
 "Security Warning" => "Avertissement de sécurité",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
@@ -125,6 +125,7 @@
 "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 !",
 "If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 4e8eb6e4fbdde21692cd33db202e5ac0c3ea08ec..986526954468b66caf8ed52aa4dd5f6555bc7925 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "Non se forneceu o tipo de obxecto.",
 "%s ID not provided." => "Non se forneceu o ID %s.",
 "Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.",
-"No categories selected for deletion." => "Non hai categorías seleccionadas para eliminar.",
+"No categories selected for deletion." => "Non se seleccionaron categorías para eliminación.",
 "Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.",
 "Sunday" => "Domingo",
 "Monday" => "Luns",
@@ -30,11 +30,11 @@
 "October" => "outubro",
 "November" => "novembro",
 "December" => "decembro",
-"Settings" => "Configuracións",
+"Settings" => "Axustes",
 "seconds ago" => "segundos atrás",
 "1 minute ago" => "hai 1 minuto",
 "{minutes} minutes ago" => "hai {minutes} minutos",
-"1 hour ago" => "hai 1 hora",
+"1 hour ago" => "Vai 1 hora",
 "{hours} hours ago" => "hai {hours} horas",
 "today" => "hoxe",
 "yesterday" => "onte",
@@ -46,8 +46,9 @@
 "years ago" => "anos atrás",
 "Choose" => "Escoller",
 "Cancel" => "Cancelar",
-"No" => "Non",
+"Error loading file picker template" => "Produciuse un erro ao cargar o modelo do selector de ficheiros",
 "Yes" => "Si",
+"No" => "Non",
 "Ok" => "Aceptar",
 "The object type is not specified." => "Non se especificou o tipo de obxecto.",
 "Error" => "Erro",
@@ -88,9 +89,9 @@
 "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
 "ownCloud password reset" => "Restabelecer o contrasinal de ownCloud",
 "Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {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 ." => "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aí pregúntelle ao seu administrador local..",
+"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",
-"Reset email send." => "Restabelecer o envío por correo.",
-"Request failed!" => "Non foi posíbel facer a petición",
 "Username" => "Nome de usuario",
 "Request reset" => "Petición de restabelecemento",
 "Your password was reset" => "O contrasinal foi restabelecido",
@@ -100,11 +101,11 @@
 "Personal" => "Persoal",
 "Users" => "Usuarios",
 "Apps" => "Aplicativos",
-"Admin" => "Admin",
+"Admin" => "Administración",
 "Help" => "Axuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
-"Edit categories" => "Editar categorías",
+"Edit categories" => "Editar as categorías",
 "Add" => "Engadir",
 "Security Warning" => "Aviso de seguranza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
@@ -125,6 +126,7 @@
 "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",
 "If you did not change your password recently, your account may be compromised!" => "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 1db5820bdf736824ff58afce5c391943eaec6907..eb2c3f3d1538979af80d18e97af9cff8942247c4 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -46,8 +46,8 @@
 "years ago" => "שנים",
 "Choose" => "בחירה",
 "Cancel" => "ביטול",
-"No" => "לא",
 "Yes" => "כן",
+"No" => "לא",
 "Ok" => "בסדר",
 "The object type is not specified." => "סוג הפריט לא צוין.",
 "Error" => "שגיאה",
@@ -63,7 +63,7 @@
 "Share with" => "שיתוף עם",
 "Share with link" => "שיתוף עם קישור",
 "Password protect" => "הגנה בססמה",
-"Password" => "ססמה",
+"Password" => "סיסמא",
 "Email link to person" => "שליחת קישור בדוא״ל למשתמש",
 "Send" => "שליחה",
 "Set expiration date" => "הגדרת תאריך תפוגה",
@@ -89,8 +89,6 @@
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
 "You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-"Reset email send." => "איפוס שליחת דוא״ל.",
-"Request failed!" => "הבקשה נכשלה!",
 "Username" => "שם משתמש",
 "Request reset" => "בקשת איפוס",
 "Your password was reset" => "הססמה שלך אופסה",
@@ -104,9 +102,10 @@
 "Help" => "עזרה",
 "Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
-"Edit categories" => "עריכת הקטגוריות",
+"Edit categories" => "ערוך קטגוריות",
 "Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
 "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 לא עובד.",
@@ -122,7 +121,7 @@
 "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/hr.php b/core/l10n/hr.php
index 86136329d8f696c5a9d959434e79378b08fffc19..660b47c54fdbb0b9566a27e9c93cd617e2229e17 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Nemate kategorija koje možete dodati?",
-"No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
+"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljak",
 "Tuesday" => "utorak",
@@ -30,10 +30,10 @@
 "years ago" => "godina",
 "Choose" => "Izaberi",
 "Cancel" => "Odustani",
-"No" => "Ne",
 "Yes" => "Da",
+"No" => "Ne",
 "Ok" => "U redu",
-"Error" => "Pogreška",
+"Error" => "Greška",
 "Share" => "Podijeli",
 "Error while sharing" => "Greška prilikom djeljenja",
 "Error while unsharing" => "Greška prilikom isključivanja djeljenja",
@@ -76,7 +76,7 @@
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
-"Advanced" => "Dodatno",
+"Advanced" => "Napredno",
 "Data folder" => "Mapa baze podataka",
 "Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 0f110bfc4c7c9b69000f250747f0092ca18fe6c8..766e1bfc7eaff091e23667c32c61bc2b00123246 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -45,9 +45,10 @@
 "last year" => "tavaly",
 "years ago" => "több éve",
 "Choose" => "Válasszon",
-"Cancel" => "Mégse",
-"No" => "Nem",
+"Cancel" => "Mégsem",
+"Error loading file picker template" => "Nem sikerült betölteni a fájlkiválasztó sablont",
 "Yes" => "Igen",
+"No" => "Nem",
 "Ok" => "Ok",
 "The object type is not specified." => "Az objektum típusa nincs megadva.",
 "Error" => "Hiba",
@@ -88,19 +89,19 @@
 "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
 "ownCloud password reset" => "ownCloud jelszó-visszaállítás",
 "Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {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 ." => "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál.",
+"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.",
-"Reset email send." => "Elküldtük az emailt a jelszó ismételt beállításához.",
-"Request failed!" => "Nem sikerült a kérést teljesíteni!",
 "Username" => "Felhasználónév",
 "Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatva",
 "To login page" => "A bejelentkező ablakhoz",
-"New password" => "Új jelszó",
+"New password" => "Az új jelszó",
 "Reset password" => "Jelszó-visszaállítás",
 "Personal" => "Személyes",
 "Users" => "Felhasználók",
 "Apps" => "Alkalmazások",
-"Admin" => "Adminisztráció",
+"Admin" => "Adminsztráció",
 "Help" => "Súgó",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
@@ -125,6 +126,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy idegenek jutottak be a rendszerbe az Ön nevében!",
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
new file mode 100644
index 0000000000000000000000000000000000000000..de0c725c73b62b4590d04682d08660eeef60c2de
--- /dev/null
+++ b/core/l10n/hy.php
@@ -0,0 +1,21 @@
+<?php $TRANSLATIONS = array(
+"Sunday" => "Ô¿Õ«Ö€Õ¡Õ¯Õ«",
+"Monday" => "ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«",
+"Tuesday" => "ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
+"Wednesday" => "Õ‰Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
+"Thursday" => "Õ€Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«",
+"Friday" => "ÕˆÖ‚Ö€Õ¢Õ¡Õ©",
+"Saturday" => "Õ‡Õ¡Õ¢Õ¡Õ©",
+"January" => "Õ€Õ¸Ö‚Õ¶Õ¾Õ¡Ö€",
+"February" => "Õ“Õ¥Õ¿Ö€Õ¾Õ¡Ö€",
+"March" => "Õ„Õ¡Ö€Õ¿",
+"April" => "Ô±ÕºÖ€Õ«Õ¬",
+"May" => "Õ„Õ¡ÕµÕ«Õ½",
+"June" => "Õ€Õ¸Ö‚Õ¶Õ«Õ½",
+"July" => "Õ€Õ¸Ö‚Õ¬Õ«Õ½",
+"August" => "Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½",
+"September" => "Սեպտեմբեր",
+"October" => "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
+"November" => "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€",
+"December" => "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
+);
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index 8adc38f0bba595f065e6a630d4649b8e7ab6624c..b6bb75f2b3becfca76fcae938bff18303dcd03b4 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -20,8 +20,10 @@
 "December" => "Decembre",
 "Settings" => "Configurationes",
 "Cancel" => "Cancellar",
+"Error" => "Error",
 "Share" => "Compartir",
 "Password" => "Contrasigno",
+"Send" => "Invia",
 "ownCloud password reset" => "Reinitialisation del contrasigno de ownCLoud",
 "Username" => "Nomine de usator",
 "Request reset" => "Requestar reinitialisation",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 9eeaba3454327241eae86adb7c02a9d2f3a5c08e..065a4f2e72771e452bcb0ecb3fbee51c5467e17c 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -44,11 +44,11 @@
 "months ago" => "beberapa bulan lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
-"Ok" => "Oke",
-"Cancel" => "Batalkan",
 "Choose" => "Pilih",
+"Cancel" => "Batal",
 "Yes" => "Ya",
 "No" => "Tidak",
+"Ok" => "Oke",
 "The object type is not specified." => "Tipe objek tidak ditentukan.",
 "Error" => "Galat",
 "The app name is not specified." => "Nama aplikasi tidak ditentukan.",
@@ -89,9 +89,7 @@
 "ownCloud password reset" => "Setel ulang sandi ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-"Reset email send." => "Email penyetelan ulang dikirim.",
-"Request failed!" => "Permintaan gagal!",
-"Username" => "Nama Pengguna",
+"Username" => "Nama pengguna",
 "Request reset" => "Ajukan penyetelan ulang",
 "Your password was reset" => "Sandi Anda telah disetel ulang",
 "To login page" => "Ke halaman masuk",
@@ -105,7 +103,7 @@
 "Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
 "Edit categories" => "Edit kategori",
-"Add" => "Tambahkan",
+"Add" => "Tambah",
 "Security Warning" => "Peringatan Keamanan",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Silakan perbarui instalasi PHP untuk dapat menggunakan ownCloud secara aman.",
@@ -114,7 +112,7 @@
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas Anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
 "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>." => "Untuk informasi lebih lanjut tentang pengaturan server yang benar, silakan lihat <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasi</a>.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Advanced" => "Tingkat Lanjut",
+"Advanced" => "Lanjutan",
 "Data folder" => "Folder data",
 "Configure the database" => "Konfigurasikan basis data",
 "will be used" => "akan digunakan",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 997a582d22867cb4f4285f0114ac20574802232b..bd8b58b29049eedc0dfe99563eb049e587ad068f 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -30,8 +30,8 @@
 "November" => "Nóvember",
 "December" => "Desember",
 "Settings" => "Stillingar",
-"seconds ago" => "sek síðan",
-"1 minute ago" => "1 min síðan",
+"seconds ago" => "sek.",
+"1 minute ago" => "Fyrir 1 mínútu",
 "{minutes} minutes ago" => "{minutes} min síðan",
 "1 hour ago" => "Fyrir 1 klst.",
 "{hours} hours ago" => "fyrir {hours} klst.",
@@ -42,11 +42,11 @@
 "{months} months ago" => "fyrir {months} mánuðum",
 "months ago" => "mánuðir síðan",
 "last year" => "síðasta ári",
-"years ago" => "árum síðan",
+"years ago" => "einhverjum árum",
 "Choose" => "Veldu",
 "Cancel" => "Hætta við",
-"No" => "Nei",
 "Yes" => "Já",
+"No" => "Nei",
 "Ok" => "Í lagi",
 "The object type is not specified." => "Tegund ekki tilgreind",
 "Error" => "Villa",
@@ -85,23 +85,21 @@
 "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ð.",
-"Reset email send." => "Beiðni um endursetningu send.",
-"Request failed!" => "Beiðni mistókst!",
 "Username" => "Notendanafn",
 "Request reset" => "Endursetja lykilorð",
 "Your password was reset" => "Lykilorðið þitt hefur verið endursett.",
 "To login page" => "Fara á innskráningarsíðu",
 "New password" => "Nýtt lykilorð",
 "Reset password" => "Endursetja lykilorð",
-"Personal" => "Persónustillingar",
+"Personal" => "Um mig",
 "Users" => "Notendur",
 "Apps" => "Forrit",
-"Admin" => "Vefstjórn",
+"Admin" => "Stjórnun",
 "Help" => "Hjálp",
 "Access forbidden" => "Aðgangur bannaður",
 "Cloud not found" => "Ský finnst ekki",
 "Edit categories" => "Breyta flokkum",
-"Add" => "Bæta",
+"Add" => "Bæta við",
 "Security Warning" => "Öryggis aðvörun",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 2d9b46ddfc128968f9041dcf7f13ab17c1cdef76..ce8f6411295657f8c4205ebf22b97800eea10a7d 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -46,8 +46,9 @@
 "years ago" => "anni fa",
 "Choose" => "Scegli",
 "Cancel" => "Annulla",
-"No" => "No",
+"Error loading file picker template" => "Errore durante il caricamento del modello del selezionatore di file",
 "Yes" => "Sì",
+"No" => "No",
 "Ok" => "Ok",
 "The object type is not specified." => "Il tipo di oggetto non è specificato.",
 "Error" => "Errore",
@@ -77,8 +78,8 @@
 "access control" => "controllo d'accesso",
 "create" => "creare",
 "update" => "aggiornare",
-"delete" => "eliminare",
-"share" => "condividere",
+"delete" => "elimina",
+"share" => "condividi",
 "Password protected" => "Protetta da password",
 "Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
 "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
@@ -88,9 +89,9 @@
 "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {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 ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
+"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",
-"Reset email send." => "Email di ripristino inviata.",
-"Request failed!" => "Richiesta non riuscita!",
 "Username" => "Nome utente",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata ripristinata",
@@ -104,7 +105,7 @@
 "Help" => "Aiuto",
 "Access forbidden" => "Accesso negato",
 "Cloud not found" => "Nuvola non trovata",
-"Edit categories" => "Modifica le categorie",
+"Edit categories" => "Modifica categorie",
 "Add" => "Aggiungi",
 "Security Warning" => "Avviso di sicurezza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
@@ -114,7 +115,7 @@
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
 "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>." => "Per informazioni su come configurare correttamente il server, vedi la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentazione</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Advanced" => "Avanzate",
+"Advanced" => "Avanzat",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
 "will be used" => "sarà utilizzato",
@@ -125,6 +126,7 @@
 "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.",
 "If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 617a8bf4f49c835f61acb66182403fd5578ee1e2..8395a1d272eb810bfaf36ccd184c4e105fa9f5d9 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -31,7 +31,7 @@
 "November" => "11月",
 "December" => "12月",
 "Settings" => "設定",
-"seconds ago" => "秒前",
+"seconds ago" => "数秒前",
 "1 minute ago" => "1 分前",
 "{minutes} minutes ago" => "{minutes} 分前",
 "1 hour ago" => "1 時間前",
@@ -46,8 +46,9 @@
 "years ago" => "年前",
 "Choose" => "選択",
 "Cancel" => "キャンセル",
-"No" => "いいえ",
+"Error loading file picker template" => "ファイルピッカーのテンプレートの読み込みエラー",
 "Yes" => "はい",
+"No" => "いいえ",
 "Ok" => "OK",
 "The object type is not specified." => "オブジェクタイプが指定されていません。",
 "Error" => "エラー",
@@ -88,19 +89,19 @@
 "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." => "メールでパスワードをリセットするリンクが届きます。",
-"Reset email send." => "リセットメールを送信します。",
-"Request failed!" => "リクエスト失敗！",
-"Username" => "ユーザ名",
+"Username" => "ユーザー名",
 "Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
 "To login page" => "ログインページへ戻る",
 "New password" => "新しいパスワードを入力",
 "Reset password" => "パスワードをリセット",
-"Personal" => "個人設定",
+"Personal" => "個人",
 "Users" => "ユーザ",
 "Apps" => "アプリ",
-"Admin" => "管理者",
+"Admin" => "管理",
 "Help" => "ヘルプ",
 "Access forbidden" => "アクセスが禁止されています",
 "Cloud not found" => "見つかりません",
@@ -110,7 +111,7 @@
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
 "Please update your PHP installation to use ownCloud securely." => "ownCloud を安全に利用するに、PHPの更新を行なってください。",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
+"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 ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
 "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>." => "あなたのサーバの適切な設定に関する情報として、<a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ドキュメント</a>を参照して下さい。",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
@@ -124,7 +125,8 @@
 "Database tablespace" => "データベースの表領域",
 "Database host" => "データベースのホスト名",
 "Finish setup" => "セットアップを完了します",
-"web services under your control" => "管理下にあるウェブサービス",
+"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/ka_GE.php b/core/l10n/ka_GE.php
index 190a2f5eabe1e2560975a3877a5ede777a210c72..b474548eae84b5444a87cf37444c0e5b834723e4 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -44,11 +44,11 @@
 "months ago" => "თვის წინ",
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
-"Ok" => "დიახ",
-"Cancel" => "უარყოფა",
 "Choose" => "არჩევა",
+"Cancel" => "უარყოფა",
 "Yes" => "კი",
 "No" => "არა",
+"Ok" => "დიახ",
 "The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
 "Error" => "შეცდომა",
 "The app name is not specified." => "აპლიკაციის სახელი არ არის მითითებული.",
@@ -60,7 +60,7 @@
 "Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
 "Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
 "Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
-"Share with" => "გაუზიარე",
+"Share with" => "გააზიარე შემდეგით:",
 "Share with link" => "გაუზიარე ლინკით",
 "Password protect" => "პაროლით დაცვა",
 "Password" => "პაროლი",
@@ -72,7 +72,7 @@
 "No people found" => "მომხმარებელი არ არის ნაპოვნი",
 "Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
 "Shared in {item} with {user}" => "გაზიარდა {item}–ში  {user}–ის მიერ",
-"Unshare" => "გაზიარების მოხსნა",
+"Unshare" => "გაუზიარებადი",
 "can edit" => "შეგიძლია შეცვლა",
 "access control" => "დაშვების კონტროლი",
 "create" => "შექმნა",
@@ -89,18 +89,16 @@
 "ownCloud password reset" => "ownCloud პაროლის შეცვლა",
 "Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
 "You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-"Reset email send." => "რესეტის მეილი გაიგზავნა",
-"Request failed!" => "მოთხოვნა შეწყდა!",
-"Username" => "მომხმარებელი",
+"Username" => "მომხმარებლის სახელი",
 "Request reset" => "პაროლის შეცვლის მოთხოვნა",
 "Your password was reset" => "თქვენი პაროლი შეცვლილია",
 "To login page" => "შესვლის გვერდზე",
 "New password" => "ახალი პაროლი",
 "Reset password" => "პაროლის შეცვლა",
 "Personal" => "პირადი",
-"Users" => "მომხმარებლები",
+"Users" => "მომხმარებელი",
 "Apps" => "აპლიკაციები",
-"Admin" => "ადმინი",
+"Admin" => "ადმინისტრატორი",
 "Help" => "დახმარება",
 "Access forbidden" => "წვდომა აკრძალულია",
 "Cloud not found" => "ღრუბელი არ არსებობს",
@@ -124,7 +122,7 @@
 "Database tablespace" => "ბაზის ცხრილის ზომა",
 "Database host" => "მონაცემთა ბაზის ჰოსტი",
 "Finish setup" => "კონფიგურაციის დასრულება",
-"web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
+"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 408afa372b7e5393fd96b806575a693cce679a96..6b97d672cfd16243adf162611e210930e2fe1c4a 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -5,10 +5,11 @@
 "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." => "객체 형식이 제공되지 않았습니다.",
 "%s ID not provided." => "%s ID가 제공되지 않았습니다.",
 "Error adding %s to favorites." => "책갈피에 %s을(를) 추가할 수 없었습니다.",
-"No categories selected for deletion." => "삭제할 분류를 선택하지 않았습니다.",
+"No categories selected for deletion." => "삭제할 분류를 선택하지 않았습니다. ",
 "Error removing %s from favorites." => "책갈피에서 %s을(를) 삭제할 수 없었습니다.",
 "Sunday" => "일요일",
 "Monday" => "월요일",
@@ -45,8 +46,8 @@
 "years ago" => "ë…„ ì „",
 "Choose" => "선택",
 "Cancel" => "취소",
-"No" => "아니요",
 "Yes" => "예",
+"No" => "아니요",
 "Ok" => "승락",
 "The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
 "Error" => "오류",
@@ -74,7 +75,7 @@
 "Unshare" => "공유 해제",
 "can edit" => "편집 가능",
 "access control" => "접근 제어",
-"create" => "만들기",
+"create" => "생성",
 "update" => "업데이트",
 "delete" => "삭제",
 "share" => "공유",
@@ -88,8 +89,6 @@
 "ownCloud password reset" => "ownCloud 암호 재설정",
 "Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
 "You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
-"Reset email send." => "초기화 이메일을 보냈습니다.",
-"Request failed!" => "요청이 실패했습니다!",
 "Username" => "사용자 이름",
 "Request reset" => "요청 초기화",
 "Your password was reset" => "암호가 재설정되었습니다",
@@ -103,11 +102,15 @@
 "Help" => "도움말",
 "Access forbidden" => "접근 금지됨",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
-"Edit categories" => "분류 편집",
+"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." => "ownCloud의 보안을 위하여 PHP 버전을 업데이트하십시오.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "안전한 난수 생성기를 사용할 수 없습니다. PHP의 OpenSSL 확장을 활성화해 주십시오.",
 "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 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
+"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>." => "서버를 올바르게 설정하는 방법을 알아보려면 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">문서</a>를 참고하십시오..",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
 "Advanced" => "고급",
 "Data folder" => "데이터 폴더",
@@ -127,6 +130,7 @@
 "Lost your password?" => "암호를 잊으셨습니까?",
 "remember" => "기억하기",
 "Log in" => "로그인",
+"Alternative Logins" => "대체 ",
 "prev" => "이전",
 "next" => "다음",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업데이트합니다. 잠시 기다려 주십시오."
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 11137f27aa2fbbce826c83290c9a485fbea37987..4c312df6618c974f3cbffe9ba995a434d5238c6b 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -30,8 +30,8 @@
 "years ago" => "Joren hier",
 "Choose" => "Auswielen",
 "Cancel" => "Ofbriechen",
-"No" => "Nee",
 "Yes" => "Jo",
+"No" => "Nee",
 "Ok" => "OK",
 "Error" => "Fehler",
 "Share" => "Deelen",
@@ -57,7 +57,7 @@
 "Access forbidden" => "Access net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
 "Edit categories" => "Kategorien editéieren",
-"Add" => "Bäisetzen",
+"Add" => "Dobäisetzen",
 "Security Warning" => "Sécherheets Warnung",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
 "Advanced" => "Avancéiert",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 563fd8884b054a2232811d8968f029935e8c59fd..1cd400117c8336afa625f31bf80b87ae6ef32ef7 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,4 +1,6 @@
 <?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",
 "No category to add?" => "NepridÄ—site jokios kategorijos?",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
 "Sunday" => "Sekmadienis",
@@ -33,8 +35,8 @@
 "years ago" => "prieš metus",
 "Choose" => "Pasirinkite",
 "Cancel" => "Atšaukti",
-"No" => "Ne",
 "Yes" => "Taip",
+"No" => "Ne",
 "Ok" => "Gerai",
 "Error" => "Klaida",
 "Share" => "Dalintis",
@@ -53,7 +55,7 @@
 "No people found" => "Žmonių nerasta",
 "Resharing is not allowed" => "Dalijinasis išnaujo negalimas",
 "Shared in {item} with {user}" => "Pasidalino {item} su {user}",
-"Unshare" => "Nesidalinti",
+"Unshare" => "Nebesidalinti",
 "can edit" => "gali redaguoti",
 "access control" => "priÄ—jimo kontrolÄ—",
 "create" => "sukurti",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 2ddea9421be7738c00f3189e0cc57fbf0f6ec651..e3d668d0183a2754b490d9a8a847c68105192d8d 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "Objekta tips nav norādīts.",
 "%s ID not provided." => "%s ID nav norādīts.",
 "Error adding %s to favorites." => "Kļūda, pievienojot %s izlasei.",
-"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai",
+"No categories selected for deletion." => "Neviena kategorija nav izvēlēta dzēšanai.",
 "Error removing %s from favorites." => "Kļūda, izņemot %s no izlases.",
 "Sunday" => "Svētdiena",
 "Monday" => "Pirmdiena",
@@ -46,8 +46,8 @@
 "years ago" => "gadus atpakaļ",
 "Choose" => "Izvēlieties",
 "Cancel" => "Atcelt",
-"No" => "NÄ“",
 "Yes" => "Jā",
+"No" => "NÄ“",
 "Ok" => "Labi",
 "The object type is not specified." => "Nav norādīts objekta tips.",
 "Error" => "Kļūda",
@@ -72,7 +72,7 @@
 "No people found" => "Nav atrastu cilvēku",
 "Resharing is not allowed" => "Atkārtota dalīšanās nav atļauta",
 "Shared in {item} with {user}" => "Dalījās ar {item} ar {user}",
-"Unshare" => "Beigt dalīties",
+"Unshare" => "Pārtraukt dalīšanos",
 "can edit" => "var rediģēt",
 "access control" => "piekļuves vadība",
 "create" => "izveidot",
@@ -89,8 +89,6 @@
 "ownCloud password reset" => "ownCloud paroles maiņa",
 "Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
 "You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-"Reset email send." => "Atstatīt e-pasta sūtīšanu.",
-"Request failed!" => "Pieprasījums neizdevās!",
 "Username" => "Lietotājvārds",
 "Request reset" => "Pieprasīt paroles maiņu",
 "Your password was reset" => "Jūsu parole tika nomainīta",
@@ -100,7 +98,7 @@
 "Personal" => "Personīgi",
 "Users" => "Lietotāji",
 "Apps" => "Lietotnes",
-"Admin" => "Administrators",
+"Admin" => "Administratori",
 "Help" => "Palīdzība",
 "Access forbidden" => "Pieeja ir liegta",
 "Cloud not found" => "Mākonis netika atrasts",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index d9da76690044bf29efb97a5b91d13941ede40714..b0c39debb8a042a2cad28af24a1102e9627ad562 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -29,7 +29,7 @@
 "October" => "Октомври",
 "November" => "Ноември",
 "December" => "Декември",
-"Settings" => "Поставки",
+"Settings" => "Подесувања",
 "seconds ago" => "пред секунди",
 "1 minute ago" => "пред 1 минута",
 "{minutes} minutes ago" => "пред {minutes} минути",
@@ -45,8 +45,8 @@
 "years ago" => "пред години",
 "Choose" => "Избери",
 "Cancel" => "Откажи",
-"No" => "Не",
 "Yes" => "Да",
+"No" => "Не",
 "Ok" => "Во ред",
 "The object type is not specified." => "Не е специфициран типот на објект.",
 "Error" => "Грешка",
@@ -85,8 +85,6 @@
 "ownCloud password reset" => "ресетирање на лозинка за ownCloud",
 "Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
 "You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-"Reset email send." => "Порката за ресетирање на лозинка пратена.",
-"Request failed!" => "Барањето не успеа!",
 "Username" => "Корисничко име",
 "Request reset" => "Побарајте ресетирање",
 "Your password was reset" => "Вашата лозинка беше ресетирана",
@@ -95,7 +93,7 @@
 "Reset password" => "Ресетирај лозинка",
 "Personal" => "Лично",
 "Users" => "Корисници",
-"Apps" => "Апликации",
+"Apps" => "Аппликации",
 "Admin" => "Админ",
 "Help" => "Помош",
 "Access forbidden" => "Забранет пристап",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index af51079b570b3fe39f41a33a2d019cd5d69df76b..e7dc73a32c15fc7a545f5e1cb057537363d50781 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "No category to add?" => "Tiada kategori untuk di tambah?",
-"No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
+"No categories selected for deletion." => "Tiada kategori dipilih untuk dibuang.",
 "Sunday" => "Ahad",
 "Monday" => "Isnin",
 "Tuesday" => "Selasa",
@@ -22,8 +22,8 @@
 "December" => "Disember",
 "Settings" => "Tetapan",
 "Cancel" => "Batal",
-"No" => "Tidak",
 "Yes" => "Ya",
+"No" => "Tidak",
 "Ok" => "Ok",
 "Error" => "Ralat",
 "Share" => "Kongsi",
@@ -44,7 +44,7 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
-"Edit categories" => "Edit kategori",
+"Edit categories" => "Ubah kategori",
 "Add" => "Tambah",
 "Security Warning" => "Amaran keselamatan",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 97631d4df58bc0df15dc225769088b9747a15063..6ea6a2c7bb52911c44f291c3b7b72002b1a06c7a 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -23,8 +23,8 @@
 "years ago" => "နှစ် အရင်က",
 "Choose" => "ရွေးချယ်",
 "Cancel" => "ပယ်ဖျက်မည်",
-"No" => "မဟုတ်ဘူး",
 "Yes" => "ဟုတ်",
+"No" => "မဟုတ်ဘူး",
 "Ok" => "အိုကေ",
 "Password" => "စကားဝှက်",
 "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 340625449eeb1704929977ffc9a0161df37245ae..30d3f91df2ac2e37421bf22ffdab07af6bd343bb 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -36,8 +36,8 @@
 "years ago" => "Ã¥r siden",
 "Choose" => "Velg",
 "Cancel" => "Avbryt",
-"No" => "Nei",
 "Yes" => "Ja",
+"No" => "Nei",
 "Ok" => "Ok",
 "Error" => "Feil",
 "Share" => "Del",
@@ -92,7 +92,7 @@
 "Database tablespace" => "Database tabellområde",
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
-"web services under your control" => "nettjenester under din kontroll",
+"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 d7379849f14936ed617d54414e1a68f019b2e0c4..0f30a2f49aa0d360d8cdfc009ae67acbda70bc6f 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -45,9 +45,10 @@
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
 "Choose" => "Kies",
-"Cancel" => "Annuleren",
-"No" => "Nee",
+"Cancel" => "Annuleer",
+"Error loading file picker template" => "Fout bij laden van bestandsselectie sjabloon",
 "Yes" => "Ja",
+"No" => "Nee",
 "Ok" => "Ok",
 "The object type is not specified." => "Het object type is niet gespecificeerd.",
 "Error" => "Fout",
@@ -75,7 +76,7 @@
 "Unshare" => "Stop met delen",
 "can edit" => "kan wijzigen",
 "access control" => "toegangscontrole",
-"create" => "maak",
+"create" => "creëer",
 "update" => "bijwerken",
 "delete" => "verwijderen",
 "share" => "deel",
@@ -88,14 +89,14 @@
 "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",
 "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.",
-"Reset email send." => "Reset e-mail verstuurd.",
-"Request failed!" => "Verzoek mislukt!",
 "Username" => "Gebruikersnaam",
 "Request reset" => "Resetaanvraag",
 "Your password was reset" => "Je wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
-"New password" => "Nieuw wachtwoord",
+"New password" => "Nieuw",
 "Reset password" => "Reset wachtwoord",
 "Personal" => "Persoonlijk",
 "Users" => "Gebruikers",
@@ -104,7 +105,7 @@
 "Help" => "Help",
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
-"Edit categories" => "Wijzigen categorieën",
+"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)",
@@ -125,6 +126,7 @@
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
 "web services under your control" => "Webdiensten in eigen beheer",
+"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
 "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!",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 61b2baffbf2136be5b10399e49d9510d603ba8c0..de181ccc7ad791cb529555aa196d8a80dd02e19d 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,4 +1,16 @@
 <?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",
+"Object type not provided." => "Ingen objekttype.",
+"%s ID not provided." => "Ingen %s-ID.",
+"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
+"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
+"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
 "Sunday" => "Søndag",
 "Monday" => "MÃ¥ndag",
 "Tuesday" => "Tysdag",
@@ -19,39 +31,110 @@
 "November" => "November",
 "December" => "Desember",
 "Settings" => "Innstillingar",
-"Cancel" => "Kanseller",
+"seconds ago" => "sekund sidan",
+"1 minute ago" => "1 minutt sidan",
+"{minutes} minutes ago" => "{minutes} minutt sidan",
+"1 hour ago" => "1 time sidan",
+"{hours} hours ago" => "{hours} timar sidan",
+"today" => "i dag",
+"yesterday" => "i går",
+"{days} days ago" => "{days} dagar sidan",
+"last month" => "førre månad",
+"{months} months ago" => "{months} månadar sidan",
+"months ago" => "månadar sidan",
+"last year" => "i fjor",
+"years ago" => "Ã¥r sidan",
+"Choose" => "Vel",
+"Cancel" => "Avbryt",
+"Yes" => "Ja",
+"No" => "Nei",
+"Ok" => "Greitt",
+"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
 "Error" => "Feil",
+"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
+"The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
+"Shared" => "Delt",
+"Share" => "Del",
+"Error while sharing" => "Feil ved deling",
+"Error while unsharing" => "Feil ved udeling",
+"Error while changing permissions" => "Feil ved endring av tillatingar",
+"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
+"Shared with you by {owner}" => "Delt med deg av {owner}",
+"Share with" => "Del med",
+"Share with link" => "Del med lenkje",
+"Password protect" => "Passordvern",
 "Password" => "Passord",
-"Use the following link to reset your password: {link}" => "Bruk føljane link til å tilbakestille passordet ditt: {link}",
-"You will receive a link to reset your password via Email." => "Du vil få ei lenkje for å nullstilla passordet via epost.",
+"Email link to person" => "Send lenkja over e-post",
+"Send" => "Send",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
+"Share via email:" => "Del over e-post:",
+"No people found" => "Fann ingen personar",
+"Resharing is not allowed" => "Vidaredeling er ikkje tillate",
+"Shared in {item} with {user}" => "Delt i {item} med {brukar}",
+"Unshare" => "Udel",
+"can edit" => "kan endra",
+"access control" => "tilgangskontroll",
+"create" => "lag",
+"update" => "oppdater",
+"delete" => "slett",
+"share" => "del",
+"Password protected" => "Passordverna",
+"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
+"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
+"Sending ..." => "Sender …",
+"Email sent" => "E-post sendt",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+"ownCloud password reset" => "Nullstilling av ownCloud-passord",
+"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {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 ." => "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?",
+"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
 "Username" => "Brukarnamn",
 "Request reset" => "Be om nullstilling",
 "Your password was reset" => "Passordet ditt er nullstilt",
-"To login page" => "Til innloggings sida",
+"To login page" => "Til innloggingssida",
 "New password" => "Nytt passord",
 "Reset password" => "Nullstill passord",
 "Personal" => "Personleg",
 "Users" => "Brukarar",
-"Apps" => "Applikasjonar",
-"Admin" => "Administrer",
+"Apps" => "Program",
+"Admin" => "Admin",
 "Help" => "Hjelp",
+"Access forbidden" => "Tilgang forbudt",
 "Cloud not found" => "Fann ikkje skyen",
+"Edit categories" => "Endra kategoriar",
 "Add" => "Legg til",
+"Security Warning" => "Tryggleiksåtvaring",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+"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>." => "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for å læra korleis du set opp tenaren din på rett måte.",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
 "Advanced" => "Avansert",
 "Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"will be used" => "vil bli nytta",
+"Configure the database" => "Set opp databasen",
+"will be used" => "vil verta nytta",
 "Database user" => "Databasebrukar",
 "Database password" => "Databasepassord",
 "Database name" => "Databasenamn",
+"Database tablespace" => "Tabellnamnrom for database",
 "Database host" => "Databasetenar",
 "Finish setup" => "Fullfør oppsettet",
-"web services under your control" => "Vev tjenester under din kontroll",
+"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!",
+"If you did not change your password recently, your account may be compromised!" => "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompromittert!",
+"Please change your password to secure your account again." => "Ver venleg og endra passordet for å gjera kontoen din trygg igjen.",
 "Lost your password?" => "Gløymt passordet?",
 "remember" => "hugs",
 "Log in" => "Logg inn",
+"Alternative Logins" => "Alternative innloggingar",
 "prev" => "førre",
-"next" => "neste"
+"next" => "neste",
+"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
 );
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index abd5f5736af2f3500ca7a7e6b1eaaffa4428115d..1d14428f183743d2f2ce37de06f3ac08153d9f53 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -8,16 +8,16 @@
 "Thursday" => "Dijòus",
 "Friday" => "Divendres",
 "Saturday" => "Dissabte",
-"January" => "Genièr",
-"February" => "Febrièr",
-"March" => "Març",
-"April" => "Abril",
-"May" => "Mai",
-"June" => "Junh",
-"July" => "Julhet",
-"August" => "Agost",
-"September" => "Septembre",
-"October" => "Octobre",
+"January" => "genièr",
+"February" => "febrièr",
+"March" => "març",
+"April" => "abril",
+"May" => "mai",
+"June" => "junh",
+"July" => "julhet",
+"August" => "agost",
+"September" => "septembre",
+"October" => "octobre",
 "November" => "Novembre",
 "December" => "Decembre",
 "Settings" => "Configuracion",
@@ -30,9 +30,9 @@
 "last year" => "an passat",
 "years ago" => "ans a",
 "Choose" => "Causís",
-"Cancel" => "Anulla",
-"No" => "Non",
+"Cancel" => "Annula",
 "Yes" => "Ã’c",
+"No" => "Non",
 "Ok" => "D'accòrdi",
 "Error" => "Error",
 "Share" => "Parteja",
@@ -48,7 +48,7 @@
 "Share via email:" => "Parteja tras corrièl :",
 "No people found" => "Deguns trobat",
 "Resharing is not allowed" => "Tornar partejar es pas permis",
-"Unshare" => "Non parteje",
+"Unshare" => "Pas partejador",
 "can edit" => "pòt modificar",
 "access control" => "Contraròtle d'acces",
 "create" => "crea",
@@ -61,11 +61,11 @@
 "ownCloud password reset" => "senhal d'ownCloud tornat botar",
 "Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
 "You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-"Username" => "Nom d'usancièr",
+"Username" => "Non d'usancièr",
 "Request reset" => "Tornar botar requesit",
 "Your password was reset" => "Ton senhal es estat tornat botar",
 "To login page" => "Pagina cap al login",
-"New password" => "Senhal nòu",
+"New password" => "Senhal novèl",
 "Reset password" => "Senhal tornat botar",
 "Personal" => "Personal",
 "Users" => "Usancièrs",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 79b7301a0392aedaddea27138980dfddddd38d99..045da821f2e0a6232aa46d74e79432cf162eeb50 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -46,8 +46,9 @@
 "years ago" => "lat temu",
 "Choose" => "Wybierz",
 "Cancel" => "Anuluj",
-"No" => "Nie",
+"Error loading file picker template" => "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu",
 "Yes" => "Tak",
+"No" => "Nie",
 "Ok" => "OK",
 "The object type is not specified." => "Nie określono typu obiektu.",
 "Error" => "BÅ‚Ä…d",
@@ -88,9 +89,9 @@
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "ownCloud password reset" => "restart hasła ownCloud",
 "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {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 ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
+"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.",
-"Reset email send." => "Wysłano e-mail resetujący.",
-"Request failed!" => "Żądanie nieudane!",
 "Username" => "Nazwa użytkownika",
 "Request reset" => "Żądanie resetowania",
 "Your password was reset" => "Zresetowano hasło",
@@ -124,7 +125,8 @@
 "Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
-"web services under your control" => "usługi internetowe pod kontrolą",
+"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!",
 "If you did not change your password recently, your account may be compromised!" => "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 378b0789ed5113bb03a9c047bcdfadfdeafe71ad..59c8f69aee719d93acd25c3da2f920b949213fa8 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "tipo de objeto não fornecido.",
 "%s ID not provided." => "%s ID não fornecido(s).",
 "Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
-"No categories selected for deletion." => "Nenhuma categoria selecionada para excluir.",
+"No categories selected for deletion." => "Nenhuma categoria selecionada para remoção.",
 "Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
 "Sunday" => "Domingo",
 "Monday" => "Segunda-feira",
@@ -30,7 +30,7 @@
 "October" => "outubro",
 "November" => "novembro",
 "December" => "dezembro",
-"Settings" => "Configurações",
+"Settings" => "Ajustes",
 "seconds ago" => "segundos atrás",
 "1 minute ago" => "1 minuto atrás",
 "{minutes} minutes ago" => "{minutes} minutos atrás",
@@ -46,8 +46,9 @@
 "years ago" => "anos atrás",
 "Choose" => "Escolha",
 "Cancel" => "Cancelar",
-"No" => "Não",
+"Error loading file picker template" => "Template selecionador Erro ao carregar arquivo",
 "Yes" => "Sim",
+"No" => "Não",
 "Ok" => "Ok",
 "The object type is not specified." => "O tipo de objeto não foi especificado.",
 "Error" => "Erro",
@@ -88,10 +89,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {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 ." => "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local.",
+"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.",
-"Reset email send." => "Email de redefinição de senha enviado.",
-"Request failed!" => "A requisição falhou!",
-"Username" => "Nome de Usuário",
+"Username" => "Nome de usuário",
 "Request reset" => "Pedir redefinição",
 "Your password was reset" => "Sua senha foi redefinida",
 "To login page" => "Para a página de login",
@@ -99,7 +100,7 @@
 "Reset password" => "Redefinir senha",
 "Personal" => "Pessoal",
 "Users" => "Usuários",
-"Apps" => "Apps",
+"Apps" => "Aplicações",
 "Admin" => "Admin",
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso proibido",
@@ -125,6 +126,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 41506bd9ec4d3c15b41481a136ad4f11b59cc362..f6de2db4fb6e184bdd0bbdb87460ecba64d2e17e 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "Tipo de objecto não fornecido",
 "%s ID not provided." => "ID %s não fornecido",
 "Error adding %s to favorites." => "Erro a adicionar %s aos favoritos",
-"No categories selected for deletion." => "Nenhuma categoria seleccionada para apagar",
+"No categories selected for deletion." => "Nenhuma categoria seleccionada para eliminar.",
 "Error removing %s from favorites." => "Erro a remover %s dos favoritos.",
 "Sunday" => "Domingo",
 "Monday" => "Segunda",
@@ -30,11 +30,11 @@
 "October" => "Outubro",
 "November" => "Novembro",
 "December" => "Dezembro",
-"Settings" => "Definições",
+"Settings" => "Configurações",
 "seconds ago" => "Minutos atrás",
 "1 minute ago" => "Há 1 minuto",
 "{minutes} minutes ago" => "{minutes} minutos atrás",
-"1 hour ago" => "Há 1 hora",
+"1 hour ago" => "Há 1 horas",
 "{hours} hours ago" => "Há {hours} horas atrás",
 "today" => "hoje",
 "yesterday" => "ontem",
@@ -46,8 +46,9 @@
 "years ago" => "anos atrás",
 "Choose" => "Escolha",
 "Cancel" => "Cancelar",
-"No" => "Não",
+"Error loading file picker template" => "Erro ao carregar arquivo do separador modelo",
 "Yes" => "Sim",
+"No" => "Não",
 "Ok" => "Ok",
 "The object type is not specified." => "O tipo de objecto não foi especificado",
 "Error" => "Erro",
@@ -63,7 +64,7 @@
 "Share with" => "Partilhar com",
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
-"Password" => "Palavra chave",
+"Password" => "Password",
 "Email link to person" => "Enviar o link por e-mail",
 "Send" => "Enviar",
 "Set expiration date" => "Especificar data de expiração",
@@ -88,14 +89,14 @@
 "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "ownCloud password reset" => "Reposição da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {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 ." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+"Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?",
 "You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
-"Reset email send." => "E-mail de reinicialização enviado.",
-"Request failed!" => "O pedido falhou!",
-"Username" => "Utilizador",
+"Username" => "Nome de utilizador",
 "Request reset" => "Pedir reposição",
 "Your password was reset" => "A sua password foi reposta",
 "To login page" => "Para a página de entrada",
-"New password" => "Nova password",
+"New password" => "Nova palavra-chave",
 "Reset password" => "Repor password",
 "Personal" => "Pessoal",
 "Users" => "Utilizadores",
@@ -125,6 +126,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index da9f1a7da943859ccbe0796b53919c01253d8e2e..3d25a5f042bbec9e59d1f47e8d3ac37c152e2686 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -5,6 +5,7 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat dosarul \"%s\" cu tine. Îl poți descărca de aici: %s ",
 "Category type not provided." => "Tipul de categorie nu este prevazut",
 "No category to add?" => "Nici o categorie de adăugat?",
+"This category already exists: %s" => "Această categorie deja există: %s",
 "Object type not provided." => "Tipul obiectului nu este prevazut",
 "%s ID not provided." => "ID-ul %s nu a fost introdus",
 "Error adding %s to favorites." => "Eroare la adăugarea %s la favorite",
@@ -29,7 +30,7 @@
 "October" => "Octombrie",
 "November" => "Noiembrie",
 "December" => "Decembrie",
-"Settings" => "Configurări",
+"Settings" => "Setări",
 "seconds ago" => "secunde în urmă",
 "1 minute ago" => "1 minut în urmă",
 "{minutes} minutes ago" => "{minutes} minute in urma",
@@ -45,13 +46,14 @@
 "years ago" => "ani în urmă",
 "Choose" => "Alege",
 "Cancel" => "Anulare",
-"No" => "Nu",
 "Yes" => "Da",
+"No" => "Nu",
 "Ok" => "Ok",
 "The object type is not specified." => "Tipul obiectului nu a fost specificat",
 "Error" => "Eroare",
 "The app name is not specified." => "Numele aplicației nu a fost specificat",
 "The required file {file} is not installed!" => "Fișierul obligatoriu {file} nu este instalat!",
+"Shared" => "Partajat",
 "Share" => "Partajează",
 "Error while sharing" => "Eroare la partajare",
 "Error while unsharing" => "Eroare la anularea partajării",
@@ -61,7 +63,7 @@
 "Share with" => "Partajat cu",
 "Share with link" => "Partajare cu legătură",
 "Password protect" => "Protejare cu parolă",
-"Password" => "Parola",
+"Password" => "Parolă",
 "Email link to person" => "Expediază legătura prin poșta electronică",
 "Send" => "Expediază",
 "Set expiration date" => "Specifică data expirării",
@@ -82,12 +84,14 @@
 "Error setting expiration date" => "Eroare la specificarea datei de expirare",
 "Sending ..." => "Se expediază...",
 "Email sent" => "Mesajul a fost expediat",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Modernizare reusita! Vei fii redirectionat!",
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {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 ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.",
+"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",
-"Reset email send." => "Resetarea emailu-lui trimisa.",
-"Request failed!" => "Solicitarea nu a reusit",
-"Username" => "Utilizator",
+"Username" => "Nume utilizator",
 "Request reset" => "Cerere trimisă",
 "Your password was reset" => "Parola a fost resetată",
 "To login page" => "Spre pagina de autentificare",
@@ -96,15 +100,19 @@
 "Personal" => "Personal",
 "Users" => "Utilizatori",
 "Apps" => "Aplicații",
-"Admin" => "Administrator",
+"Admin" => "Admin",
 "Help" => "Ajutor",
 "Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
-"Edit categories" => "Editează categoriile",
+"Edit categories" => "Editează categorii",
 "Add" => "Adaugă",
 "Security Warning" => "Avertisment de securitate",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabil la acest atac un octet null  (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Vă rugăm să actualizați instalarea dvs. PHP pentru a utiliza ownCloud in siguranță.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Generatorul de numere pentru securitate nu este disponibil, va rog activati extensia PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Fara generatorul pentru numere de securitate , un atacator poate afla parola si reseta contul tau",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul de date și fișiere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcționează.",
+"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>." => "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>.",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
 "Advanced" => "Avansat",
 "Data folder" => "Director date",
@@ -124,6 +132,7 @@
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "amintește",
 "Log in" => "Autentificare",
+"Alternative Logins" => "Conectări alternative",
 "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 2f90c5c5df3917ec986a3327b9c85a192d725e5a..608b9271df5e7e889b903fa20bf5d3a8306d2812 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -30,7 +30,7 @@
 "October" => "Октябрь",
 "November" => "Ноябрь",
 "December" => "Декабрь",
-"Settings" => "Настройки",
+"Settings" => "Конфигурация",
 "seconds ago" => "несколько секунд назад",
 "1 minute ago" => "1 минуту назад",
 "{minutes} minutes ago" => "{minutes} минут назад",
@@ -45,9 +45,10 @@
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
 "Choose" => "Выбрать",
-"Cancel" => "Отмена",
-"No" => "Нет",
+"Cancel" => "Отменить",
+"Error loading file picker template" => "Ошибка при загрузке файла выбора  шаблона",
 "Yes" => "Да",
+"No" => "Нет",
 "Ok" => "Ок",
 "The object type is not specified." => "Тип объекта не указан",
 "Error" => "Ошибка",
@@ -88,9 +89,9 @@
 "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
 "ownCloud password reset" => "Сброс пароля ",
 "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?" => "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
-"Reset email send." => "Отправка письма с информацией для сброса.",
-"Request failed!" => "Запрос не удался!",
 "Username" => "Имя пользователя",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
@@ -100,11 +101,11 @@
 "Personal" => "Личное",
 "Users" => "Пользователи",
 "Apps" => "Приложения",
-"Admin" => "Администратор",
+"Admin" => "Admin",
 "Help" => "Помощь",
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
-"Edit categories" => "Редактировать категории",
+"Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
@@ -124,7 +125,8 @@
 "Database tablespace" => "Табличое пространство базы данных",
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
-"web services under your control" => "Сетевые службы под твоим контролем",
+"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/ru_RU.php b/core/l10n/ru_RU.php
index 0399d56dfcf020d8e771fd77d28fc72443db2e7a..580df5961f80b764fa4dd88d58add1a9aada8036 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -1,137 +1,7 @@
 <?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." => "Тип объекта не предоставлен.",
-"%s ID not provided." => "%s ID не предоставлен.",
-"Error adding %s to favorites." => "Ошибка добавления %s в избранное.",
-"No categories selected for deletion." => "Нет категорий, выбранных для удаления.",
-"Error removing %s from favorites." => "Ошибка удаления %s из избранного.",
-"Sunday" => "Воскресенье",
-"Monday" => "Понедельник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четверг",
-"Friday" => "Пятница",
-"Saturday" => "Суббота",
-"January" => "Январь",
-"February" => "Февраль",
-"March" => "Март",
-"April" => "Апрель",
-"May" => "Май",
-"June" => "Июнь",
-"July" => "Июль",
-"August" => "Август",
-"September" => "Сентябрь",
-"October" => "Октябрь",
-"November" => "Ноябрь",
-"December" => "Декабрь",
 "Settings" => "Настройки",
-"seconds ago" => "секунд назад",
-"1 minute ago" => " 1 минуту назад",
-"{minutes} minutes ago" => "{минуты} минут назад",
-"1 hour ago" => "1 час назад",
-"{hours} hours ago" => "{часы} часов назад",
-"today" => "сегодня",
-"yesterday" => "вчера",
-"{days} days ago" => "{дни} дней назад",
-"last month" => "в прошлом месяце",
-"{months} months ago" => "{месяцы} месяцев назад",
-"months ago" => "месяц назад",
-"last year" => "в прошлом году",
-"years ago" => "лет назад",
-"Choose" => "Выбрать",
 "Cancel" => "Отмена",
-"No" => "Нет",
-"Yes" => "Да",
-"Ok" => "Да",
-"The object type is not specified." => "Тип объекта не указан.",
 "Error" => "Ошибка",
-"The app name is not specified." => "Имя приложения не указано.",
-"The required file {file} is not installed!" => "Требуемый файл {файл} не установлен!",
-"Shared" => "Опубликовано",
 "Share" => "Сделать общим",
-"Error while sharing" => "Ошибка создания общего доступа",
-"Error while unsharing" => "Ошибка отключения общего доступа",
-"Error while changing permissions" => "Ошибка при изменении прав доступа",
-"Shared with you and the group {group} by {owner}" => "Опубликовано для Вас и группы {группа} {собственник}",
-"Shared with you by {owner}" => "Опубликовано для Вас {собственник}",
-"Share with" => "Сделать общим с",
-"Share with link" => "Опубликовать с ссылкой",
-"Password protect" => "Защитить паролем",
-"Password" => "Пароль",
-"Email link to person" => "Ссылка на адрес электронной почты",
-"Send" => "Отправить",
-"Set expiration date" => "Установить срок действия",
-"Expiration date" => "Дата истечения срока действия",
-"Share via email:" => "Сделать общедоступным посредством email:",
-"No people found" => "Не найдено людей",
-"Resharing is not allowed" => "Рекурсивный общий доступ не разрешен",
-"Shared in {item} with {user}" => "Совместное использование в {объект} с {пользователь}",
-"Unshare" => "Отключить общий доступ",
-"can edit" => "возможно редактирование",
-"access control" => "контроль доступа",
-"create" => "создать",
-"update" => "обновить",
-"delete" => "удалить",
-"share" => "сделать общим",
-"Password protected" => "Пароль защищен",
-"Error unsetting expiration date" => "Ошибка при отключении даты истечения срока действия",
-"Error setting expiration date" => "Ошибка при установке даты истечения срока действия",
-"Sending ..." => "Отправка ...",
-"Email sent" => "Письмо отправлено",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Обновление прошло неудачно. Пожалуйста, сообщите об этом результате в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Немедленное перенаправление Вас на ownCloud.",
-"ownCloud password reset" => "Переназначение пароля",
-"Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}",
-"You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.",
-"Reset email send." => "Сброс отправки email.",
-"Request failed!" => "Не удалось выполнить запрос!",
-"Username" => "Имя пользователя",
-"Request reset" => "Сброс запроса",
-"Your password was reset" => "Ваш пароль был переустановлен",
-"To login page" => "На страницу входа",
-"New password" => "Новый пароль",
-"Reset password" => "Переназначение пароля",
-"Personal" => "Персональный",
-"Users" => "Пользователи",
-"Apps" => "Приложения",
-"Admin" => "Администратор",
-"Help" => "Помощь",
-"Access forbidden" => "Доступ запрещен",
-"Cloud not found" => "Облако не найдено",
-"Edit categories" => "Редактирование категорий",
-"Add" => "Добавить",
-"Security Warning" => "Предупреждение системы безопасности",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
-"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 не работает.",
-"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>." => "Для информации как правильно настроить Ваш сервер, пожалйста загляните в <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документацию</a>.",
-"Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
-"Advanced" => "Расширенный",
-"Data folder" => "Папка данных",
-"Configure the database" => "Настроить базу данных",
-"will be used" => "будет использоваться",
-"Database user" => "Пользователь базы данных",
-"Database password" => "Пароль базы данных",
-"Database name" => "Имя базы данных",
-"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" => "запомнить",
-"Log in" => "Войти",
-"Alternative Logins" => "Альтернативные Имена",
-"prev" => "предыдущий",
-"next" => "следующий",
-"Updating ownCloud to version %s, this may take a while." => "Обновление ownCloud до версии %s, это может занять некоторое время."
+"Add" => "Добавить"
 );
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index eaafca2f3f6008478f4e63f7230b6bdec973c2f9..be7c1a24aad895bb0d9d7693a7ff80f17fca0ee2 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -16,10 +16,10 @@
 "July" => "ජූලි",
 "August" => "අගෝස්තු",
 "September" => "සැප්තැම්බර්",
-"October" => "ඔක්තෝබර්",
+"October" => "ඔක්තෝබර",
 "November" => "නොවැම්බර්",
 "December" => "දෙසැම්බර්",
-"Settings" => "සැකසුම්",
+"Settings" => "සිටුවම්",
 "seconds ago" => "තත්පරයන්ට පෙර",
 "1 minute ago" => "1 මිනිත්තුවකට පෙර",
 "today" => "අද",
@@ -30,15 +30,15 @@
 "years ago" => "අවුරුදු කීපයකට පෙර",
 "Choose" => "තෝරන්න",
 "Cancel" => "එපා",
-"No" => "නැහැ",
 "Yes" => "ඔව්",
+"No" => "එපා",
 "Ok" => "හරි",
 "Error" => "දෝෂයක්",
 "Share" => "බෙදා හදා ගන්න",
 "Share with" => "බෙදාගන්න",
 "Share with link" => "යොමුවක් මඟින් බෙදාගන්න",
 "Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
-"Password" => "මුර පදය ",
+"Password" => "මුර පදය",
 "Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
 "Expiration date" => "කල් ඉකුත් විමේ දිනය",
 "Share via email:" => "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: ",
@@ -54,11 +54,10 @@
 "Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
 "ownCloud password reset" => "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
 "You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-"Request failed!" => "ඉල්ලීම අසාර්ථකයි!",
 "Username" => "පරිශීලක නම",
 "Your password was reset" => "ඔබේ මුරපදය ප්‍රත්‍යාරම්භ කරන ලදී",
 "To login page" => "පිවිසුම් පිටුවට",
-"New password" => "නව මුර පදයක්",
+"New password" => "නව මුරපදය",
 "Reset password" => "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
 "Personal" => "පෞද්ගලික",
 "Users" => "පරිශීලකයන්",
@@ -68,7 +67,7 @@
 "Access forbidden" => "ඇතුල් වීම තහනම්",
 "Cloud not found" => "සොයා ගත නොහැක",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
-"Add" => "එක් කරන්න",
+"Add" => "එකතු කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
 "Advanced" => "දියුණු/උසස්",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 9b0bd45fce3980d12117a3f484a4f3d01439392d..2dfaa01b5a1f9d2bfacd0ba374adf8ce5fde5425 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -34,7 +34,7 @@
 "seconds ago" => "pred sekundami",
 "1 minute ago" => "pred minútou",
 "{minutes} minutes ago" => "pred {minutes} minútami",
-"1 hour ago" => "Pred 1 hodinou.",
+"1 hour ago" => "Pred 1 hodinou",
 "{hours} hours ago" => "Pred {hours} hodinami.",
 "today" => "dnes",
 "yesterday" => "včera",
@@ -46,8 +46,8 @@
 "years ago" => "pred rokmi",
 "Choose" => "Výber",
 "Cancel" => "Zrušiť",
-"No" => "Nie",
 "Yes" => "Áno",
+"No" => "Nie",
 "Ok" => "Ok",
 "The object type is not specified." => "Nešpecifikovaný typ objektu.",
 "Error" => "Chyba",
@@ -88,10 +88,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
 "ownCloud password reset" => "Obnovenie hesla pre ownCloud",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {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 ." => "Odkaz na obnovenie hesla bol odoslaný na Vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si Váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
+"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.",
-"Reset email send." => "Obnovovací email bol odoslaný.",
-"Request failed!" => "Požiadavka zlyhala!",
-"Username" => "Prihlasovacie meno",
+"Username" => "Meno používateľa",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
 "To login page" => "Na prihlasovaciu stránku",
@@ -100,11 +100,11 @@
 "Personal" => "Osobné",
 "Users" => "Používatelia",
 "Apps" => "Aplikácie",
-"Admin" => "Administrácia",
+"Admin" => "Administrátor",
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
-"Edit categories" => "Úprava kategórií",
+"Edit categories" => "Upraviť kategórie",
 "Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
@@ -124,7 +124,8 @@
 "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",
+"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é!",
 "If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index df86a608bbd44e66f58882ae4fd18c0e66376b8b..a433aa2cc4ec8d1fcc810d8244d588c86c12b883 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -34,7 +34,7 @@
 "seconds ago" => "pred nekaj sekundami",
 "1 minute ago" => "pred minuto",
 "{minutes} minutes ago" => "pred {minutes} minutami",
-"1 hour ago" => "pred 1 uro",
+"1 hour ago" => "Pred 1 uro",
 "{hours} hours ago" => "pred {hours} urami",
 "today" => "danes",
 "yesterday" => "včeraj",
@@ -46,8 +46,8 @@
 "years ago" => "let nazaj",
 "Choose" => "Izbor",
 "Cancel" => "Prekliči",
-"No" => "Ne",
 "Yes" => "Da",
+"No" => "Ne",
 "Ok" => "V redu",
 "The object type is not specified." => "Vrsta predmeta ni podana.",
 "Error" => "Napaka",
@@ -72,7 +72,7 @@
 "No people found" => "Ni najdenih uporabnikov",
 "Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena",
 "Shared in {item} with {user}" => "V souporabi v {item} z {user}",
-"Unshare" => "Odstrani souporabo",
+"Unshare" => "Prekliči souporabo",
 "can edit" => "lahko ureja",
 "access control" => "nadzor dostopa",
 "create" => "ustvari",
@@ -88,10 +88,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
 "ownCloud password reset" => "Ponastavitev gesla za oblak ownCloud",
 "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {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 ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
 "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-"Reset email send." => "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov.",
-"Request failed!" => "Zahteva je spodletela!",
-"Username" => "Uporabniško Ime",
+"Username" => "Uporabniško ime",
 "Request reset" => "Zahtevaj ponovno nastavitev",
 "Your password was reset" => "Geslo je ponovno nastavljeno",
 "To login page" => "Na prijavno stran",
@@ -125,6 +125,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index f869d1bc2801c617e36768f7c5896b61c22d195e..40562add933e72af656cf1b96feb62fdc3ed94e1 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -30,7 +30,7 @@
 "October" => "Tetor",
 "November" => "Nëntor",
 "December" => "Dhjetor",
-"Settings" => "Parametrat",
+"Settings" => "Parametra",
 "seconds ago" => "sekonda më parë",
 "1 minute ago" => "1 minutë më parë",
 "{minutes} minutes ago" => "{minutes} minuta më parë",
@@ -46,8 +46,8 @@
 "years ago" => "vite më parë",
 "Choose" => "Zgjidh",
 "Cancel" => "Anulo",
-"No" => "Jo",
 "Yes" => "Po",
+"No" => "Jo",
 "Ok" => "Në rregull",
 "The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
 "Error" => "Veprim i gabuar",
@@ -88,9 +88,9 @@
 "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
 "ownCloud password reset" => "Rivendosja e kodit të ownCloud-it",
 "Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {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 ." => "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?",
 "You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-"Reset email send." => "Emaili i rivendosjes u dërgua.",
-"Request failed!" => "Kërkesa dështoi!",
 "Username" => "Përdoruesi",
 "Request reset" => "Bëj kërkesë për rivendosjen",
 "Your password was reset" => "Kodi yt u rivendos",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 557cb6a8aba0ba8865f03a4f28a3c4d52962129f..49664f19f34b6324559b658e986e2eb2243c9db0 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -27,7 +27,7 @@
 "October" => "Октобар",
 "November" => "Новембар",
 "December" => "Децембар",
-"Settings" => "Подешавања",
+"Settings" => "Поставке",
 "seconds ago" => "пре неколико секунди",
 "1 minute ago" => "пре 1 минут",
 "{minutes} minutes ago" => "пре {minutes} минута",
@@ -43,14 +43,14 @@
 "years ago" => "година раније",
 "Choose" => "Одабери",
 "Cancel" => "Откажи",
-"No" => "Не",
 "Yes" => "Да",
+"No" => "Не",
 "Ok" => "У реду",
 "The object type is not specified." => "Врста објекта није подешена.",
 "Error" => "Грешка",
 "The app name is not specified." => "Име програма није унето.",
 "The required file {file} is not installed!" => "Потребна датотека {file} није инсталирана.",
-"Share" => "Дељење",
+"Share" => "Дели",
 "Error while sharing" => "Грешка у дељењу",
 "Error while unsharing" => "Грешка код искључења дељења",
 "Error while changing permissions" => "Грешка код промене дозвола",
@@ -67,7 +67,7 @@
 "No people found" => "Особе нису пронађене.",
 "Resharing is not allowed" => "Поновно дељење није дозвољено",
 "Shared in {item} with {user}" => "Подељено унутар {item} са {user}",
-"Unshare" => "Не дели",
+"Unshare" => "Укини дељење",
 "can edit" => "може да мења",
 "access control" => "права приступа",
 "create" => "направи",
@@ -82,18 +82,16 @@
 "ownCloud password reset" => "Поништавање лозинке за ownCloud",
 "Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
 "You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
-"Reset email send." => "Захтев је послат поштом.",
-"Request failed!" => "Захтев одбијен!",
 "Username" => "Корисничко име",
 "Request reset" => "Захтевај ресетовање",
 "Your password was reset" => "Ваша лозинка је ресетована",
 "To login page" => "На страницу за пријаву",
 "New password" => "Нова лозинка",
 "Reset password" => "Ресетуј лозинку",
-"Personal" => "Лична",
+"Personal" => "Лично",
 "Users" => "Корисници",
-"Apps" => "Програми",
-"Admin" => "Аднинистрација",
+"Apps" => "Апликације",
+"Admin" => "Администратор",
 "Help" => "Помоћ",
 "Access forbidden" => "Забрањен приступ",
 "Cloud not found" => "Облак није нађен",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index ec3eab34e29d801fec536a601e20bc22e6213392..238843aa1762711c47198fef0f76878141d65a9f 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -27,7 +27,7 @@
 "Your password was reset" => "Vaša lozinka je resetovana",
 "New password" => "Nova lozinka",
 "Reset password" => "Resetuj lozinku",
-"Personal" => "Lična",
+"Personal" => "Lično",
 "Users" => "Korisnici",
 "Apps" => "Programi",
 "Admin" => "Adninistracija",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index ff2e8d8d68061862ea4b2798ad0838dd17a14cb8..d4154678b65c3a7286d59f1be73d13191d7a532e 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -46,8 +46,8 @@
 "years ago" => "Ã¥r sedan",
 "Choose" => "Välj",
 "Cancel" => "Avbryt",
-"No" => "Nej",
 "Yes" => "Ja",
+"No" => "Nej",
 "Ok" => "Ok",
 "The object type is not specified." => "Objekttypen är inte specificerad.",
 "Error" => "Fel",
@@ -89,8 +89,6 @@
 "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}",
 "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.",
-"Reset email send." => "Återställ skickad e-post.",
-"Request failed!" => "Begäran misslyckades!",
 "Username" => "Användarnamn",
 "Request reset" => "Begär återställning",
 "Your password was reset" => "Ditt lösenord har återställts",
@@ -104,7 +102,7 @@
 "Help" => "Hjälp",
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
-"Edit categories" => "Redigera kategorier",
+"Edit categories" => "Editera kategorier",
 "Add" => "Lägg till",
 "Security Warning" => "Säkerhetsvarning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
@@ -114,7 +112,7 @@
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
 "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>." => "För information hur man korrekt konfigurera servern, var god se <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Advanced" => "Avancerat",
+"Advanced" => "Avancerad",
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
 "will be used" => "kommer att användas",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 9863ca8154e80b85e80be36669fd038637e4345f..b67f5e967ece8c2a8da9be5d5c459dad0adbb2e2 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -41,8 +41,8 @@
 "years ago" => "வருடங்களுக்கு முன்",
 "Choose" => "தெரிவுசெய்க ",
 "Cancel" => "இரத்து செய்க",
-"No" => "இல்லை",
 "Yes" => "ஆம்",
+"No" => "இல்லை",
 "Ok" => "சரி",
 "The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
 "Error" => "வழு",
@@ -64,10 +64,10 @@
 "No people found" => "நபர்கள் யாரும் இல்லை",
 "Resharing is not allowed" => "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
 "Shared in {item} with {user}" => "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
-"Unshare" => "பகிரமுடியாது",
+"Unshare" => "பகிரப்படாதது",
 "can edit" => "தொகுக்க முடியும்",
 "access control" => "கட்டுப்பாடான அணுகல்",
-"create" => "படைத்தல்",
+"create" => "உருவவாக்கல்",
 "update" => "இற்றைப்படுத்தல்",
 "delete" => "நீக்குக",
 "share" => "பகிர்தல்",
@@ -77,8 +77,6 @@
 "ownCloud password reset" => "ownCloud இன் கடவுச்சொல் மீளமைப்பு",
 "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
 "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-"Reset email send." => "மின்னுஞ்சல் அனுப்புதலை மீளமைக்குக",
-"Request failed!" => "வேண்டுகோள் தோல்வியுற்றது!",
 "Username" => "பயனாளர் பெயர்",
 "Request reset" => "கோரிக்கை மீளமைப்பு",
 "Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது",
@@ -86,9 +84,9 @@
 "New password" => "புதிய கடவுச்சொல்",
 "Reset password" => "மீளமைத்த கடவுச்சொல்",
 "Personal" => "தனிப்பட்ட",
-"Users" => "பயனாளர்கள்",
-"Apps" => "பயன்பாடுகள்",
-"Admin" => "நிர்வாகி",
+"Users" => "பயனாளர்",
+"Apps" => "செயலிகள்",
+"Admin" => "நிர்வாகம்",
 "Help" => "உதவி",
 "Access forbidden" => "அணுக தடை",
 "Cloud not found" => "Cloud காணப்படவில்லை",
@@ -98,7 +96,7 @@
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. ",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
-"Advanced" => "மேம்பட்ட",
+"Advanced" => "உயர்ந்த",
 "Data folder" => "தரவு கோப்புறை",
 "Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
 "will be used" => "பயன்படுத்தப்படும்",
@@ -108,7 +106,7 @@
 "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/te.php b/core/l10n/te.php
index a18af79ab17fc27766dc860487404f9577cc3380..1469d37296f33e76d3d4cec12ab148a34674946d 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -34,8 +34,8 @@
 "last year" => "పోయిన సంవత్సరం",
 "years ago" => "సంవత్సరాల క్రితం",
 "Cancel" => "రద్దుచేయి",
-"No" => "కాదు",
 "Yes" => "అవును",
+"No" => "కాదు",
 "Ok" => "సరే",
 "Error" => "పొరపాటు",
 "Password" => "సంకేతపదం",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 560c150066c2977bef212a13fa7d90cc007d5fd5..66f5629b93309c2085c4eb680ec22ee865594500 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -45,11 +45,11 @@
 "years ago" => "ปี ที่ผ่านมา",
 "Choose" => "เลือก",
 "Cancel" => "ยกเลิก",
-"No" => "ไม่ตกลง",
 "Yes" => "ตกลง",
+"No" => "ไม่ตกลง",
 "Ok" => "ตกลง",
 "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
-"Error" => "พบข้อผิดพลาด",
+"Error" => "ข้อผิดพลาด",
 "The app name is not specified." => "ชื่อของแอปยังไม่ได้รับการระบุชื่อ",
 "The required file {file} is not installed!" => "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้องได้รับการติดตั้งไว้ก่อน ยังไม่ได้ถูกติดตั้ง",
 "Shared" => "แชร์แล้ว",
@@ -88,8 +88,6 @@
 "ownCloud password reset" => "รีเซ็ตรหัสผ่าน ownCloud",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-"Reset email send." => "รีเซ็ตค่าการส่งอีเมล",
-"Request failed!" => "คำร้องขอล้มเหลว!",
 "Username" => "ชื่อผู้ใช้งาน",
 "Request reset" => "ขอเปลี่ยนรหัสใหม่",
 "Your password was reset" => "รหัสผ่านของคุณถูกเปลี่ยนเรียบร้อยแล้ว",
@@ -98,8 +96,8 @@
 "Reset password" => "เปลี่ยนรหัสผ่าน",
 "Personal" => "ส่วนตัว",
 "Users" => "ผู้ใช้งาน",
-"Apps" => "Apps",
-"Admin" => "ผู้ดูแลระบบ",
+"Apps" => "แอปฯ",
+"Admin" => "ผู้ดูแล",
 "Help" => "ช่วยเหลือ",
 "Access forbidden" => "การเข้าถึงถูกหวงห้าม",
 "Cloud not found" => "ไม่พบ Cloud",
@@ -119,7 +117,7 @@
 "Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
-"web services under your control" => "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/tr.php b/core/l10n/tr.php
index 342a010da0aae55f674c07c64eb24210fcc68548..47574a012590f34a68a870aa308e5bfbdbc03240 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -46,8 +46,8 @@
 "years ago" => "yıl önce",
 "Choose" => "seç",
 "Cancel" => "Ä°ptal",
-"No" => "Hayır",
 "Yes" => "Evet",
+"No" => "Hayır",
 "Ok" => "Tamam",
 "The object type is not specified." => "Nesne türü belirtilmemiş.",
 "Error" => "Hata",
@@ -88,10 +88,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
 "ownCloud password reset" => "ownCloud parola sıfırlama",
 "Use the following link to reset your password: {link}" => "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {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 ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>I Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek.",
-"Reset email send." => "Sıfırlama epostası gönderildi.",
-"Request failed!" => "Ä°stek reddedildi!",
-"Username" => "Kullanıcı adı",
+"Username" => "Kullanıcı Adı",
 "Request reset" => "Sıfırlama iste",
 "Your password was reset" => "Parolanız sıfırlandı",
 "To login page" => "Giriş sayfasına git",
@@ -101,7 +101,7 @@
 "Users" => "Kullanıcılar",
 "Apps" => "Uygulamalar",
 "Admin" => "Yönetici",
-"Help" => "Yardı",
+"Help" => "Yardım",
 "Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
 "Edit categories" => "Kategorileri düzenle",
@@ -124,7 +124,8 @@
 "Database tablespace" => "Veritabanı tablo alanı",
 "Database host" => "Veritabanı sunucusu",
 "Finish setup" => "Kurulumu tamamla",
-"web services under your control" => "kontrolünüzdeki web servisleri",
+"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!",
 "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1bf48e07dded9119c15e733ebc761836cc69f57
--- /dev/null
+++ b/core/l10n/ug.php
@@ -0,0 +1,48 @@
+<?php $TRANSLATIONS = array(
+"Sunday" => "يەكشەنبە",
+"Monday" => "دۈشەنبە",
+"Tuesday" => "سەيشەنبە",
+"Wednesday" => "چارشەنبە",
+"Thursday" => "پەيشەنبە",
+"Friday" => "جۈمە",
+"Saturday" => "شەنبە",
+"January" => "قەھرىتان",
+"February" => "ھۇت",
+"March" => "نەۋرۇز",
+"April" => "ئۇمۇت",
+"May" => "باھار",
+"June" => "سەپەر",
+"July" => "چىللە",
+"August" => "تومۇز",
+"September" => "مىزان",
+"October" => "ئوغۇز",
+"November" => "ئوغلاق",
+"December" => "ÙƒÛ†Ù†Û•Ùƒ",
+"Settings" => "تەڭشەكلەر",
+"1 minute ago" => "1 مىنۇت ئىلگىرى",
+"1 hour ago" => "1 سائەت ئىلگىرى",
+"today" => "بۈگۈن",
+"yesterday" => "تۈنۈگۈن",
+"Cancel" => "ۋاز كەچ",
+"Yes" => "ھەئە",
+"No" => "ياق",
+"Ok" => "جەزملە",
+"Error" => "خاتالىق",
+"Share" => "ھەمبەھىر",
+"Share with" => "ھەمبەھىر",
+"Password" => "ئىم",
+"Send" => "يوللا",
+"Unshare" => "ھەمبەھىرلىمە",
+"delete" => "ئۆچۈر",
+"share" => "ھەمبەھىر",
+"Username" => "ئىشلەتكۈچى ئاتى",
+"New password" => "يېڭى ئىم",
+"Personal" => "شەخسىي",
+"Users" => "ئىشلەتكۈچىلەر",
+"Apps" => "ئەپلەر",
+"Help" => "ياردەم",
+"Add" => "قوش",
+"Advanced" => "ئالىي",
+"Finish setup" => "تەڭشەك تامام",
+"Log out" => "تىزىمدىن چىق"
+);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 685a31d52edffa8b1153a089c2fe840702de00c6..65577297c3cc07a4ad7bddf9e799bbf55cd316e4 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -46,8 +46,8 @@
 "years ago" => "роки тому",
 "Choose" => "Обрати",
 "Cancel" => "Відмінити",
-"No" => "Ні",
 "Yes" => "Так",
+"No" => "Ні",
 "Ok" => "Ok",
 "The object type is not specified." => "Не визначено тип об'єкту.",
 "Error" => "Помилка",
@@ -72,7 +72,7 @@
 "No people found" => "Жодної людини не знайдено",
 "Resharing is not allowed" => "Пере-публікація не дозволяється",
 "Shared in {item} with {user}" => "Опубліковано {item} для {user}",
-"Unshare" => "Заборонити доступ",
+"Unshare" => "Закрити доступ",
 "can edit" => "може редагувати",
 "access control" => "контроль доступу",
 "create" => "створити",
@@ -89,8 +89,6 @@
 "ownCloud password reset" => "скидання пароля ownCloud",
 "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-"Reset email send." => "Лист скидання відправлено.",
-"Request failed!" => "Невдалий запит!",
 "Username" => "Ім'я користувача",
 "Request reset" => "Запит скидання",
 "Your password was reset" => "Ваш пароль був скинутий",
@@ -100,13 +98,15 @@
 "Personal" => "Особисте",
 "Users" => "Користувачі",
 "Apps" => "Додатки",
-"Admin" => "Адміністратор",
+"Admin" => "Адмін",
 "Help" => "Допомога",
 "Access forbidden" => "Доступ заборонено",
 "Cloud not found" => "Cloud не знайдено",
 "Edit categories" => "Редагувати категорії",
 "Add" => "Додати",
 "Security Warning" => "Попередження про небезпеку",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Будь ласка, оновіть інсталяцію PHP для безпечного використання ownCloud.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Не доступний безпечний генератор випадкових чисел, будь ласка, активуйте PHP OpenSSL додаток.",
 "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 файл не працює.",
@@ -122,7 +122,7 @@
 "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/ur_PK.php b/core/l10n/ur_PK.php
index e2448c4d651789fd23ea55c4f978187f66f783d9..cf26212c25e05eccebffaa6f35b43969034b72ed 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -16,8 +16,8 @@
 "Settings" => "سیٹینگز",
 "Choose" => "منتخب کریں",
 "Cancel" => "منسوخ کریں",
-"No" => "نہیں",
 "Yes" => "ہاں",
+"No" => "نہیں",
 "Ok" => "اوکے",
 "Error" => "ایرر",
 "Error while sharing" => "شئیرنگ کے دوران ایرر",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index f03c58f34919aea91001b9860ef36bac668a5ddf..3e320ecf800dc2d37f61dde172d57623ded11a9d 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -9,7 +9,7 @@
 "Object type not provided." => "Loại đối tượng không được cung cấp.",
 "%s ID not provided." => "%s ID không được cung cấp.",
 "Error adding %s to favorites." => "Lỗi thêm %s vào mục yêu thích.",
-"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
+"No categories selected for deletion." => "Bạn chưa chọn mục để xóa",
 "Error removing %s from favorites." => "Lỗi xóa %s từ mục yêu thích.",
 "Sunday" => "Chủ nhật",
 "Monday" => "Thứ 2",
@@ -46,8 +46,8 @@
 "years ago" => "năm trước",
 "Choose" => "Chọn",
 "Cancel" => "Hủy",
-"No" => "Không",
 "Yes" => "Có",
+"No" => "Không",
 "Ok" => "Đồng ý",
 "The object type is not specified." => "Loại đối tượng không được chỉ định.",
 "Error" => "Lá»—i",
@@ -72,7 +72,7 @@
 "No people found" => "Không tìm thấy người nào",
 "Resharing is not allowed" => "Chia sẻ lại không được cho phép",
 "Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
-"Unshare" => "Gỡ bỏ chia sẻ",
+"Unshare" => "Bỏ chia sẻ",
 "can edit" => "có thể chỉnh sửa",
 "access control" => "quản lý truy cập",
 "create" => "tạo",
@@ -88,25 +88,27 @@
 "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
 "ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
 "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {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 ." => "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?",
 "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-"Reset email send." => "Thiết lập lại email gởi.",
-"Request failed!" => "Yêu cầu  của bạn không thành công !",
-"Username" => "Tên người dùng",
+"Username" => "Tên đăng nhập",
 "Request reset" => "Yêu cầu thiết lập lại ",
 "Your password was reset" => "Mật khẩu của bạn đã được khôi phục",
 "To login page" => "Trang đăng nhập",
 "New password" => "Mật khẩu mới",
 "Reset password" => "Khôi phục mật khẩu",
 "Personal" => "Cá nhân",
-"Users" => "Người sử dụng",
+"Users" => "Người dùng",
 "Apps" => "Ứng dụng",
 "Admin" => "Quản trị",
 "Help" => "Giúp đỡ",
 "Access forbidden" => "Truy cập bị cấm",
 "Cloud not found" => "Không tìm thấy Clound",
-"Edit categories" => "Sửa thể loại",
+"Edit categories" => "Sửa chuyên mục",
 "Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng ownCloud một cách an toàn.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật  PHP OpenSSL extension.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Nếu không có random number generator , Hacker có thể  thiết lập lại mật khẩu và chiếm tài khoản của bạn.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
@@ -122,7 +124,8 @@
 "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" => "các dịch vụ web dưới sự kiểm soát của bạn",
+"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 !",
 "If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index e7c99413cdc6f821be86f6728c1413e97611003a..2e0d0da6f2f9fedc6437fecb8419f83257ed4674 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -7,7 +7,7 @@
 "No category to add?" => "没有分类添加了?",
 "This category already exists: %s" => "此分类已存在：%s",
 "Object type not provided." => "未选择对象类型。",
-"No categories selected for deletion." => "没有选者要删除的分类.",
+"No categories selected for deletion." => "没有选中要删除的分类。",
 "Sunday" => "星期天",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -43,11 +43,11 @@
 "years ago" => "年前",
 "Choose" => "选择",
 "Cancel" => "取消",
-"No" => "否",
 "Yes" => "是",
+"No" => "否",
 "Ok" => "好的",
 "The object type is not specified." => "未指定对象类型。",
-"Error" => "错误",
+"Error" => "出错",
 "The app name is not specified." => "未指定应用名称。",
 "The required file {file} is not installed!" => "未安装所需要的文件 {file} ！",
 "Shared" => "已分享",
@@ -86,18 +86,16 @@
 "ownCloud password reset" => "私有云密码重置",
 "Use the following link to reset your password: {link}" => "使用下面的链接来重置你的密码:{link}",
 "You will receive a link to reset your password via Email." => "你将会收到一个重置密码的链接",
-"Reset email send." => "重置邮件已发送。",
-"Request failed!" => "请求失败！",
 "Username" => "用户名",
 "Request reset" => "要求重置",
 "Your password was reset" => "你的密码已经被重置了",
 "To login page" => "转至登陆页面",
 "New password" => "新密码",
 "Reset password" => "重置密码",
-"Personal" => "个人的",
+"Personal" => "私人",
 "Users" => "用户",
-"Apps" => "应用程序",
-"Admin" => "管理",
+"Apps" => "程序",
+"Admin" => "管理员",
 "Help" => "帮助",
 "Access forbidden" => "禁止访问",
 "Cloud not found" => "云 没有被找到",
@@ -120,7 +118,7 @@
 "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/zh_CN.php b/core/l10n/zh_CN.php
index 68f8280f7991ad192a8f099fc120ff8bf35d040f..016a13625692ff3f4d0533e4e8747062553fe79b 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -46,21 +46,22 @@
 "years ago" => "年前",
 "Choose" => "选择(&C)...",
 "Cancel" => "取消",
-"No" => "否",
+"Error loading file picker template" => "加载文件选择器模板出错",
 "Yes" => "是",
+"No" => "否",
 "Ok" => "好",
 "The object type is not specified." => "未指定对象类型。",
 "Error" => "错误",
 "The app name is not specified." => "未指定App名称。",
 "The required file {file} is not installed!" => "所需文件{file}未安装！",
 "Shared" => "已共享",
-"Share" => "共享",
+"Share" => "分享",
 "Error while sharing" => "共享时出错",
 "Error while unsharing" => "取消共享时出错",
 "Error while changing permissions" => "修改权限时出错",
 "Shared with you and the group {group} by {owner}" => "{owner}共享给您及{group}组",
 "Shared with you by {owner}" => " {owner}与您共享",
-"Share with" => "共享",
+"Share with" => "分享之",
 "Share with link" => "共享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
@@ -88,9 +89,9 @@
 "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>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<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." => "您将会收到包含可以重置密码链接的邮件。",
-"Reset email send." => "重置邮件已发送。",
-"Request failed!" => "请求失败！",
 "Username" => "用户名",
 "Request reset" => "请求重置",
 "Your password was reset" => "您的密码已重置",
@@ -100,13 +101,15 @@
 "Personal" => "个人",
 "Users" => "用户",
 "Apps" => "应用",
-"Admin" => "管理员",
+"Admin" => "管理",
 "Help" => "帮助",
 "Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
 "Edit categories" => "编辑分类",
-"Add" => "添加",
+"Add" => "增加",
 "Security Warning" => "安全警告",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "为保证安全使用 ownCloud 请更新您的PHP。",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展",
 "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 并未正常工作。",
@@ -122,12 +125,14 @@
 "Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
-"web services under your control" => "由您掌控的网络服务",
+"web services under your control" => "您控制的web服务",
+"%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!" => "如果您没有最近修改您的密码，您的帐户可能会受到影响！",
 "Please change your password to secure your account again." => "请修改您的密码，以保护您的账户安全。",
 "Lost your password?" => "忘记密码？",
+"remember" => "记住",
 "Log in" => "登录",
 "Alternative Logins" => "其他登录方式",
 "prev" => "上一页",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index d02b7be6601c9f85ad38d284aefa84265a5bc590..21418fe2eeb9bdf1742c05e3f77f86c8cf9a59df 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -24,8 +24,8 @@
 "last month" => "前一月",
 "months ago" => "個月之前",
 "Cancel" => "取消",
-"No" => "No",
 "Yes" => "Yes",
+"No" => "No",
 "Ok" => "OK",
 "Error" => "錯誤",
 "Shared" => "已分享",
@@ -55,8 +55,6 @@
 "The update was successful. Redirecting you to ownCloud now." => "更新成功, 正",
 "Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}",
 "You will receive a link to reset your password via Email." => "你將收到一封電郵",
-"Reset email send." => "重設密碼郵件已傳",
-"Request failed!" => "請求失敗",
 "Username" => "用戶名稱",
 "Request reset" => "重設",
 "Your password was reset" => "你的密碼已被重設",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index a6c4251d1fad3a44981b41bcd30f195b96fab02a..10279c7ba182e4c87b1bdd94b08c62af5eb9a597 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -34,7 +34,7 @@
 "seconds ago" => "幾秒前",
 "1 minute ago" => "1 分鐘前",
 "{minutes} minutes ago" => "{minutes} 分鐘前",
-"1 hour ago" => "1 個小時前",
+"1 hour ago" => "1 小時之前",
 "{hours} hours ago" => "{hours} 小時前",
 "today" => "今天",
 "yesterday" => "昨天",
@@ -46,9 +46,10 @@
 "years ago" => "幾年前",
 "Choose" => "選擇",
 "Cancel" => "取消",
-"No" => "No",
-"Yes" => "Yes",
-"Ok" => "Ok",
+"Error loading file picker template" => "載入檔案選擇器樣板發生錯誤",
+"Yes" => "是",
+"No" => "否",
+"Ok" => "好",
 "The object type is not specified." => "未指定物件類型。",
 "Error" => "錯誤",
 "The app name is not specified." => "沒有指定 app 名稱。",
@@ -68,7 +69,7 @@
 "Send" => "寄出",
 "Set expiration date" => "設置到期日",
 "Expiration date" => "到期日",
-"Share via email:" => "透過 email 分享：",
+"Share via email:" => "透過電子郵件分享：",
 "No people found" => "沒有找到任何人",
 "Resharing is not allowed" => "不允許重新分享",
 "Shared in {item} with {user}" => "已和 {user} 分享 {item}",
@@ -82,33 +83,33 @@
 "Password protected" => "受密碼保護",
 "Error unsetting expiration date" => "解除過期日設定失敗",
 "Error setting expiration date" => "錯誤的到期日設定",
-"Sending ..." => "正在寄出...",
+"Sending ..." => "正在傳送...",
 "Email sent" => "Email 已寄出",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "升級失敗，請將此問題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。",
 "ownCloud password reset" => "ownCloud 密碼重設",
-"Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼： {link}",
+"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 ." => "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。",
+"Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
-"Reset email send." => "重設郵件已送出。",
-"Request failed!" => "請求失敗！",
 "Username" => "使用者名稱",
 "Request reset" => "請求重設",
-"Your password was reset" => "你的密碼已重設",
+"Your password was reset" => "您的密碼已重設",
 "To login page" => "至登入頁面",
 "New password" => "新密碼",
 "Reset password" => "重設密碼",
 "Personal" => "個人",
 "Users" => "使用者",
 "Apps" => "應用程式",
-"Admin" => "管理者",
-"Help" => "幫助",
+"Admin" => "管理",
+"Help" => "說明",
 "Access forbidden" => "存取被拒",
-"Cloud not found" => "未發現雲",
+"Cloud not found" => "未發現雲端",
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的PHP版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "請更新您的PHP安裝以更安全地使用ownCloud。",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "請更新您的 PHP 安裝以更安全地使用 ownCloud 。",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "沒有可用的亂數產生器，請啟用 PHP 中的 OpenSSL 擴充功能。",
 "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." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
@@ -124,11 +125,12 @@
 "Database tablespace" => "資料庫 tablespace",
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
-"web services under your control" => "網路服務在您控制之下",
+"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!" => "如果您最近並未更改密碼，您的帳號可能已經遭到入侵！",
-"Please change your password to secure your account again." => "請更改您的密碼以再次取得您的帳戶的控制權。",
+"Please change your password to secure your account again." => "請更改您的密碼以再次取得您帳戶的控制權。",
 "Lost your password?" => "忘記密碼？",
 "remember" => "記住",
 "Log in" => "登入",
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index dc9f0bc8ad380b891df236caf3ffc8830ebd6fca..c19c6893f13fe69d61c2b4aa7a7fa808044831bd 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -1,17 +1,24 @@
-<form action="<?php echo OC_Helper::linkToRoute('core_lostpassword_send_email') ?>" method="post">
-	<fieldset>
-		<?php echo $l->t('You will receive a link to reset your password via Email.'); ?>
-		<?php if ($_['requested']): ?>
-			<?php echo $l->t('Reset email send.'); ?>
-		<?php else: ?>
+<?php if ($_['requested']): ?>
+	<div class="success"><p>
+	<?php
+		print_unescaped($l->t('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 .'));
+	?>
+	</p></div>
+<?php else: ?>
+	<form action="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_send_email')) ?>" method="post">
+		<fieldset>
 			<?php if ($_['error']): ?>
-				<?php echo $l->t('Request failed!'); ?>
+				<div class="errors"><p>
+				<?php print_unescaped($l->t('Request failed!<br>Did you make sure your email/username was right?')); ?>
+				</p></div>
 			<?php endif; ?>
+			<?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?>
 			<p class="infield">
-				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 				<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=""/>
 			</p>
-			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
-		<?php endif; ?>
-	</fieldset>
-</form>
+			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
+		</fieldset>
+	</form>
+<?php endif; ?>
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
new file mode 100644
index 0000000000000000000000000000000000000000..e761fbdb567bb89623465c146a2bb786835f3eb0
--- /dev/null
+++ b/core/templates/filepicker.html
@@ -0,0 +1,10 @@
+<div id="{dialog_name}" title="{title}">
+	<span class="dirtree"></span>
+	<ul class="filelist">
+		<li data-entryname="{filename}" data-type="{type}">
+			<img />
+			<span class="filename">{filename}</span>
+			<span class="date">{date}</span>
+		</li>
+	</ul>
+</div>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index c034fe5b52f90acaa4930b57ca90b03b7f9a4bff..de7ff8c168cfbafd4e1c1dbb1656671fd5ed6055 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -63,6 +63,7 @@
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
 			<input type="text" name="directory" id="directory"
+				placeholder="<?php p(OC::$SERVERROOT."/data"); ?>"
 				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 04161925436ec4720ff9f474042dd246bb65b619..a3a8dc5f7ba0c7dd3013bbec3f18b7edadf7cb5d 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -5,7 +5,7 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
-	<head>
+	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index cfe0a5519434fbff5ea01615d780e6bdd5d816d5..a3ebf3abd0359418af1949b1f84f3c9b85bbc7a6 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -5,10 +5,11 @@
 <!--[if IE 9]><html class="ng-csp ie ie9 lte9"><![endif]-->
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
-	<head>
+	<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>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 		<meta name="apple-itunes-app" content="app-id=543672169">
 		<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')); ?>" />
@@ -32,6 +33,9 @@
 	<body id="<?php p($_['bodyid']);?>">
 	<div id="notification-container">
 		<div id="notification"></div>
+		<?php if ($_['updateAvailable']): ?>
+			<div id="update-notification" style="display: inline;"><a href="<?php print_unescaped($_['updateLink']); ?>"><?php p($l->t('%s is available. Get more information on how to update.', array($_['updateVersion']))); ?></a></div>
+		<?php endif; ?>
 	</div>
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
diff --git a/core/templates/login.php b/core/templates/login.php
index 2c9884f52469f8963887493b9441aee1c7eade02..571e0a865d96bcc959439b4530330672e5a471f1 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -4,23 +4,14 @@
 	<?php if (!empty($_['redirect_url'])) {
 		print_unescaped('<input type="hidden" name="redirect_url" value="' . OC_Util::sanitizeHTML($_['redirect_url']) . '" />');
 	} ?>
-		<ul>
-			<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
-			<li class="errors">
-				<?php p($l->t('Automatic logon rejected!')); ?><br>
-				<small><?php p($l->t('If you did not change your password recently, your account may be compromised!')); ?></small>
-				<br>
-				<small><?php p($l->t('Please change your password to secure your account again.')); ?></small>
-			</li>
-			<?php endif; ?>
-			<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
-			<a href="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_index')) ?>">
-				<li class="errors">
-					<?php p($l->t('Lost your password?')); ?>
-				</li>
-			</a>
-			<?php endif; ?>
-		</ul>
+		<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+		<div class="warning">
+			<?php p($l->t('Automatic logon rejected!')); ?><br>
+			<small><?php p($l->t('If you did not change your password recently, your account may be compromised!')); ?></small>
+			<br>
+			<small><?php p($l->t('Please change your password to secure your account again.')); ?></small>
+		</div>
+		<?php endif; ?>
 		<p class="infield grouptop">
 			<input type="text" name="user" id="user" placeholder=""
 				   value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?>
@@ -37,6 +28,13 @@
 			<input type="checkbox" id="show" name="show" />
 			<label for="show"></label>
 		</p>
+
+		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+		<a class="warning" href="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_index')) ?>">
+			<?php p($l->t('Lost your password?')); ?>
+		</a>
+		<?php endif; ?>
+
 		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
 			for="remember_login"><?php p($l->t('remember')); ?></label>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
diff --git a/core/templates/message.html b/core/templates/message.html
new file mode 100644
index 0000000000000000000000000000000000000000..59048100f32031358ef32d6cc1c8e49e401ed64b
--- /dev/null
+++ b/core/templates/message.html
@@ -0,0 +1,3 @@
+<div id="{dialog_name}" title="{title}">
+	<p><span class="ui-icon ui-icon-{type}"></span>{message}</p>
+</div>
diff --git a/cron.php b/cron.php
index 086f96f3665acafb658ce556447f9c0e2419c117..95cedf8bf4c8852bf2f22c01b6474f9cb6267cb8 100644
--- a/cron.php
+++ b/cron.php
@@ -1,27 +1,27 @@
 <?php
 /**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Jakob Sack
+ * @copyright 2012 Jakob Sack owncloud@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 // Unfortunately we need this class for shutdown function
-class my_temporary_cron_class {
+class TemporaryCronClass {
 	public static $sent = false;
 	public static $lockfile = "";
 	public static $keeplock = false;
@@ -30,29 +30,27 @@ class my_temporary_cron_class {
 // We use this function to handle (unexpected) shutdowns
 function handleUnexpectedShutdown() {
 	// Delete lockfile
-	if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) {
-		unlink( my_temporary_cron_class::$lockfile );
+	if (!TemporaryCronClass::$keeplock && file_exists(TemporaryCronClass::$lockfile)) {
+		unlink(TemporaryCronClass::$lockfile);
 	}
-	
+
 	// Say goodbye if the app did not shutdown properly
-	if( !my_temporary_cron_class::$sent ) {
-		if( OC::$CLI ) {
-			echo 'Unexpected error!'.PHP_EOL;
-		}
-		else{
-			OC_JSON::error( array( 'data' => array( 'message' => 'Unexpected error!')));
+	if (!TemporaryCronClass::$sent) {
+		if (OC::$CLI) {
+			echo 'Unexpected error!' . PHP_EOL;
+		} else {
+			OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
 		}
 	}
 }
 
-$RUNTIME_NOSETUPFS = true;
 require_once 'lib/base.php';
 
 session_write_close();
 
 // Don't do anything if ownCloud has not been installed
-if( !OC_Config::getValue( 'installed', false )) {
-	exit( 0 );
+if (!OC_Config::getValue('installed', false)) {
+	exit(0);
 }
 
 // Handle unexpected errors
@@ -63,54 +61,58 @@ OC_Helper::cleanTmpNoClean();
 
 // Exit if background jobs are disabled!
 $appmode = OC_BackgroundJob::getExecutionType();
-if( $appmode == 'none' ) {
-	my_temporary_cron_class::$sent = true;
-	if( OC::$CLI ) {
-		echo 'Background Jobs are disabled!'.PHP_EOL;
+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!')));
 	}
-	else{
-		OC_JSON::error( array( 'data' => array( 'message' => 'Background jobs disabled!')));
-	}
-	exit( 1 );
+	exit(1);
 }
 
-if( OC::$CLI ) {
+if (OC::$CLI) {
 	// Create lock file first
-	my_temporary_cron_class::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
-	
+	TemporaryCronClass::$lockfile = OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/cron.lock';
+
 	// We call ownCloud from the CLI (aka cron)
-	if( $appmode != 'cron' ) {
+	if ($appmode != 'cron') {
 		// Use cron in feature!
-		OC_BackgroundJob::setExecutionType('cron' );
+		OC_BackgroundJob::setExecutionType('cron');
 	}
 
 	// check if backgroundjobs is still running
-	if( file_exists( my_temporary_cron_class::$lockfile )) {
-		my_temporary_cron_class::$keeplock = true;
-		my_temporary_cron_class::$sent = true;
+	if (file_exists(TemporaryCronClass::$lockfile)) {
+		TemporaryCronClass::$keeplock = true;
+		TemporaryCronClass::$sent = true;
 		echo "Another instance of cron.php is still running!";
-		exit( 1 );
+		exit(1);
 	}
 
 	// Create a lock file
-	touch( my_temporary_cron_class::$lockfile );
+	touch(TemporaryCronClass::$lockfile);
 
 	// Work
-	OC_BackgroundJob_Worker::doAllSteps();
-}
-else{
+	$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' ) {
+	if ($appmode == 'cron') {
 		// Cron is cron :-P
-		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
-	}
-	else{
+		OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
+	} else {
 		// Work and success :-)
-		OC_BackgroundJob_Worker::doNextStep();
+		$jobList = new \OC\BackgroundJob\JobList();
+		$job = $jobList->getNext();
+		$job->execute($jobList);
+		$jobList->setLastJob($job);
 		OC_JSON::success();
 	}
 }
 
 // done!
-my_temporary_cron_class::$sent = true;
+TemporaryCronClass::$sent = true;
 exit();
diff --git a/db_structure.xml b/db_structure.xml
index 11387222340de314da947effbe4097f740abafb4..933b09988f0b77b4cb25c6a5cc048a2e8b05a1e8 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -280,6 +280,14 @@
 				<length>4</length>
 			</field>
 
+			<field>
+				<name>storage_mtime</name>
+				<type>integer</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
 			<field>
 				<name>encrypted</name>
 				<type>integer</type>
@@ -288,6 +296,14 @@
 				<length>4</length>
 			</field>
 
+            <field>
+                <name>unencrypted_size</name>
+                <type>integer</type>
+                <default></default>
+                <notnull>true</notnull>
+                <length>8</length>
+            </field>
+
 			<field>
 				<name>etag</name>
 				<type>text</type>
@@ -843,7 +859,7 @@
 
 	<table>
 
-		<name>*dbprefix*queuedtasks</name>
+		<name>*dbprefix*jobs</name>
 
 		<declaration>
 
@@ -858,35 +874,35 @@
 			</field>
 
 			<field>
-				<name>app</name>
+				<name>class</name>
 				<type>text</type>
 				<default></default>
 				<notnull>true</notnull>
-				<length>255</length>
+				<length>256</length>
 			</field>
 
 			<field>
-				<name>klass</name>
+				<name>argument</name>
 				<type>text</type>
 				<default></default>
 				<notnull>true</notnull>
-				<length>255</length>
+				<length>256</length>
 			</field>
 
 			<field>
-				<name>method</name>
-				<type>text</type>
+				<name>last_run</name>
+				<type>integer</type>
 				<default></default>
-				<notnull>true</notnull>
-				<length>255</length>
+				<notnull>false</notnull>
 			</field>
 
-			<field>
-				<name>parameters</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
+			<index>
+				<name>job_class_index</name>
+				<field>
+					<name>class</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
 
 		</declaration>
 
@@ -910,7 +926,6 @@
 				<name>displayname</name>
 				<type>text</type>
 				<default></default>
-				<notnull>true</notnull>
 				<length>64</length>
 			</field>
 
diff --git a/index.html b/index.html
index 69d42e3a0b37a0368482f8a776804faba34c4d36..f160f46b6fc2bf9a7c1351dde07695afb1e249f2 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+	<script type="text/javascript"> window.location.href="index.php"; </script>
 	<meta http-equiv="refresh" content="0; URL=index.php">
 </head>
 </html>
diff --git a/l10n/.tx/config b/l10n/.tx/config
index b6589d8112d951141fd582c97459c797304b32d5..70ec332856487044079364d86fd1b5feedc2089d 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -5,16 +5,19 @@ host = https://www.transifex.net
 file_filter = <lang>/core.po
 source_file = templates/core.pot
 source_lang = en
+type = PO
 
 [owncloud.files]
 file_filter = <lang>/files.po
 source_file = templates/files.pot
 source_lang = en
+type = PO
 
 [owncloud.settings]
 file_filter = <lang>/settings.po
 source_file = templates/settings.pot
 source_lang = en
+type = PO
 
 [owncloud.lib]
 file_filter = <lang>/lib.po
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index b520c39f30159d244687c0489f88c12a51527bea..c4e1228259d021e2571a768b937c24fe096bdf4d 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jano Barnard <translate@janobarnard.co.za>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:00+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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -238,8 +241,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
@@ -292,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -395,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gebruik die volgende skakel om jou wagwoord te herstel: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Herstel-versoek"
 
@@ -518,37 +526,37 @@ msgstr "Gevorderd"
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Stel databasis op"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "sal gebruik word"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasis-gebruiker"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasis-wagwoord"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasis naam"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
@@ -556,37 +564,42 @@ msgstr "Maak opstelling klaar"
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Teken uit"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Jou wagwoord verloor?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "onthou"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Teken aan"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 7b727d3ae3ef0d898c2d30a9834370aa2fa5474f..159278587dc0c76462a8aa7acb347498203adade 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 535d61f3944e2ad9099a07268529c8a148d1f446..3ed16041c2edd66c99ad1c09285d9ce51aa3991d 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index d8d3d0197b653027605df01cc367b13c38844dc9..30a7d769223ce12c074b2816bc0b67744fd87df8 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 13198e5bec20f029ab3424944a060a6543497688..934d01cdeb964bf4de770e3487498a2ca323a4ed 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/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-02-05 00:19+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr "Wagwoord"
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index b065abd8d774a4dfa58fd9825a6764aa6c3924ba..59b6ea0942ba2798b3d9aee9163d51e33a2f6382 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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/files_versions.po b/l10n/af_ZA/files_versions.po
index cf1a612ba6ed129afd9e8319b3984db150301695..a663f48e1751178506b8c9d837661e7a0a0f07c0 100644
--- a/l10n/af_ZA/files_versions.po
+++ b/l10n/af_ZA/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 2196458f399bbb1a26497f8c102bb5353689ec69..40e272fd5c41ef62afa1351890a0e0dd24904adf 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hulp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Instellings"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Toepassings"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index f4b399dbdd1df993c8fc3b110e8ba3335c9b0817..868778c6d74865626b94207bdeb4d3e4b373f97b 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -419,82 +423,74 @@ msgstr "Nuwe wagwoord"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 982e4b399ca20a313537b497e87601c044010a5c..71d8cea474a0e5de65cc918209db4610f81acfdb 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hulp"
diff --git a/l10n/af_ZA/user_webdavauth.po b/l10n/af_ZA/user_webdavauth.po
index 5ccd72fea359c9b0cfd294d593cf7751d879156f..62bfbe01b3489a9901061bd6f44f09e8ea5a8eb0 100644
--- a/l10n/af_ZA/user_webdavauth.po
+++ b/l10n/af_ZA/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-02-01 00:17+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 377f6c17f8473cae477413431d18f75edfc140dd..0215ac951722f1b2577710c5f37c1284e6594285 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
-#   <shiningmoon25@gmail.com>, 2012.
-#  <tarek.taha@gmail.com>, 2013.
-#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: blackcoder <tarek.taha@gmail.com>\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -162,77 +158,81 @@ msgstr "كانون الاول"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "تعديلات"
+msgstr "إعدادات"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "منذ دقيقة"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} منذ دقائق"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "قبل ساعة مضت"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ساعة مضت"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} يوم سابق"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} شهر مضت"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "سنة مضت"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "اختيار"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "الغاء"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "لا"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "نعم"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "لا"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "موافق"
 
@@ -297,9 +297,9 @@ msgstr "شارك مع رابط"
 msgid "Password protect"
 msgstr "حماية كلمة السر"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "كلمة السر"
+msgstr "كلمة المرور"
 
 #: js/share.js:173
 msgid "Email link to person"
@@ -400,24 +400,27 @@ msgstr "إعادة تعيين كلمة سر ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "إعادة إرسال البريد الإلكتروني."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "فشل الطلب"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "طلب تعديل"
 
@@ -431,7 +434,7 @@ msgstr "الى صفحة الدخول"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "كلمة سر جديدة"
+msgstr "كلمات سر جديدة"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -439,11 +442,11 @@ msgstr "تعديل كلمة السر"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "خصوصيات"
+msgstr "شخصي"
 
 #: strings.php:6
 msgid "Users"
-msgstr "المستخدم"
+msgstr "المستخدمين"
 
 #: strings.php:7
 msgid "Apps"
@@ -451,7 +454,7 @@ msgstr "التطبيقات"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "مستخدم رئيسي"
+msgstr "المدير"
 
 #: strings.php:9
 msgid "Help"
@@ -471,7 +474,7 @@ msgstr "عدل الفئات"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "أدخل"
+msgstr "اضف"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -517,81 +520,86 @@ msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "خيارات متقدمة"
+msgstr "تعديلات متقدمه"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "مجلد المعلومات"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "أسس قاعدة البيانات"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "مستخدم قاعدة البيانات"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "كلمة سر مستخدم قاعدة البيانات"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "إسم قاعدة البيانات"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "مساحة جدول قاعدة البيانات"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "خادم قاعدة البيانات"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "خدمات الوب تحت تصرفك"
+msgstr "خدمات الشبكة تحت سيطرتك"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "الخروج"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "تم رفض تسجيل الدخول التلقائي!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "الرجاء إعادة تعيين كلمة السر لتأمين حسابك."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "تذكر"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "أدخل"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "اسماء دخول بديلة"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 287a7043f3a624c894ba7ec13d11c8be54f0077b..a52047896fb48b59bf0a53466aac8f3e7566d373 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
-#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -29,10 +27,6 @@ msgstr "فشل في نقل الملف %s - يوجد ملف بنفس هذا ال
 msgid "Could not move %s"
 msgstr "فشل في نقل %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "فشل في اعادة تسمية الملف"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "لم يتم رفع أي ملف , خطأ غير معروف"
@@ -80,55 +74,59 @@ msgstr "مسار غير صحيح."
 msgid "Files"
 msgstr "الملفات"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "شارك"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "محذوف"
+msgstr "إلغاء"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "استبدال"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "اقترح إسم"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "إلغاء"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "استبدل {new_name}  بـ  {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "جاري تنفيذ عملية الحذف"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "جاري رفع 1 ملف"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -154,72 +152,80 @@ msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "مساحتك التخزينية امتلأت تقريبا "
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "فشل في رفع ملفاتك , إما أنها مجلد أو حجمها 0 بايت"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "خطأ"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "الاسم"
+msgstr "اسم"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ملفات"
 
+#: 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 "إرفع"
+msgstr "رفع"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -277,37 +283,37 @@ msgstr "حذف الملفات"
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "لا تملك صلاحيات الكتابة هنا."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري فحص الملفات ."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "الفحص الحالي"
 
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index e11e221b6e2b02542015b13657abcffb23a7adb0..bcccd33c2f8d5b21b547bdf635ccda3d6bb84900 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <hussein-atef@hotmail.com>, 2012.
-# Raed Chammem <shemada@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-19 00:04+0100\n"
-"PO-Revision-Date: 2013-03-18 11:00+0000\n"
-"Last-Translator: Raed667 <shemada@gmail.com>\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "جاري الحفظ..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "التشفير"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "تشفير الملفات فعال."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "الملفات الاتية لن يتم تشفيرها:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "إستثناء أنواع الملفات الاتية من التشفير: "
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "لا شيء"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index d7c1d01ac437892069d65c18ae63a89393858f02..dc64cac0bb5910126edb6092d45e32768b35933b 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
@@ -97,7 +104,7 @@ msgstr "المستخدمين"
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "حذف"
+msgstr "إلغاء"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 92546656f2ff041f2cffa93cb908fe87829a3491..58015e50318cec1999dc0f8c3cd244fcc77a5e1e 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <shiningmoon25@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:42+0000\n"
-"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,24 +25,24 @@ msgstr "كلمة المرور"
 msgid "Submit"
 msgstr "تطبيق"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s شارك المجلد %s معك"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s شارك الملف %s معك"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "لا يوجد عرض مسبق لـ"
 
-#: templates/public.php:43
+#: 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 c10f296ee743632af998786346ba00f6040b29dc..50981cac8bd7a817afedf786c0f60633fb2ad72e 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <tarek.taha@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "تعذّر حذف%s بشكل دائم"
 msgid "Couldn't restore %s"
 msgstr "تعذّر استرجاع %s "
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "إبدء عملية الإستعادة"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "خطأ"
 
@@ -40,31 +39,31 @@ msgstr "خطأ"
 msgid "delete file permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "اسم"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "تم الحذف"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} ملفات"
 
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index c086e82cd3196102a8f8ca536ddd92f42d5e8af3..9066fe25fafa54cb1db92342cdfe4f8905b8f84e 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <shiningmoon25@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 511c1cbb18762955292317890275e99a02b4d4c8..c02d196fb2ebcc6c69c3a797dc284e6c59b42921 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Matalqah <houfa2005@yahoo.com>\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: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "المساعدة"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "شخصي"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
-msgstr "تعديلات"
+msgstr "إعدادات"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "المستخدمين"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "التطبيقات"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "المدير"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "تحميل ملفات ZIP متوقف"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "العودة الى الملفات"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "تعذّر تحديده"
 
@@ -94,10 +93,6 @@ msgstr "اعداد اسم مستخدم للمدير"
 msgid "Set an admin password."
 msgstr "اعداد كلمة مرور للمدير"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "تحديد مجلد "
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعد
 msgid "%s set the database host."
 msgstr "%s ادخل اسم خادم قاعدة البيانات"
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير."
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "خطأ في قواعد البيانات : \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "الأمر المخالف كان : \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "أسم المستخدم  '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "احذف اسم المستخدم هذا من الـ MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "أسم المستخدم  '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "احذف اسم المستخدم هذا من الـ MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
@@ -240,19 +239,6 @@ msgstr "السنةالماضية"
 msgid "years ago"
 msgstr "سنة مضت"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s متاح . احصل على <a href=\"%s\">المزيد من المعلومات </a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "محدّث"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "فحص التحديثات معطّل"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 56dec41573605a412b0c4f6d9f3d922d15b31564..90cafbceddef8f13aa4e774902a92d15c85c0415 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmad Matalqah <houfa2005@yahoo.com>, 2013.
-#   <icewind1991@gmail.com>, 2012.
-# Raed Chammem <shemada@gmail.com>, 2013.
-#   <shiningmoon25@gmail.com>, 2012.
-#   <tarek.taha@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "فشل تحميل القائمة من الآب ستور"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "لم يتم التأكد من الشخصية بنجاح"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "تعذر تغيير اسم الحساب"
 
@@ -69,7 +68,7 @@ msgstr "تم تغيير اللغة"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "طلبك غير مفهوم"
+msgstr "طلب غير مفهوم"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -121,52 +120,52 @@ msgstr "حصل خطأ أثناء تحديث التطبيق"
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "حفظ"
+msgstr "جاري الحفظ..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "تم الحذف"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "تراجع"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "تعذر حذف المستخدم"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "مجموعات"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "مدير المجموعة"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "حذف"
+msgstr "إلغاء"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "اضافة مجموعة"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "يجب ادخال اسم مستخدم صحيح"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "حصل خطأ اثناء انشاء مستخدم"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "يجب ادخال كلمة مرور صحيحة"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -317,19 +316,19 @@ msgstr "سجل"
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,9 +399,9 @@ msgstr "احصل على التطبيقات لمزامنة ملفاتك"
 msgid "Show First Run Wizard again"
 msgstr "ابدأ خطوات بداية التشغيل من جديد"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
-msgstr "كلمات السر"
+msgstr "كلمة المرور"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -424,82 +423,74 @@ msgstr "كلمات سر جديدة"
 msgid "Change password"
 msgstr "عدل كلمة السر"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "اسم الحساب"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "تم تغيير اسم حسابك بنجاح"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "تعذر تغيير اسم حسابك"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "تغيير اسم الحساب"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "العنوان البريدي"
+msgstr "البريد الإلكترونى"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "عنوانك البريدي"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "اللغة"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "اسم الدخول"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "انشئ"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "وحدة التخزين الافتراضية"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "غير محدود"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "شيء آخر"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "وحدة التخزين"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "تغيير اسم الحساب"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "اعداد كلمة مرور جديدة"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "افتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index e9c5205c1558b1047a223e6bbd5b2bf7d1e153dc..725f5ca966b0256b7995feea6d35029d09fa45b7 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "المساعدة"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 14d1b06562b22ca8ca2d6973f0456e87956506dd..0b90ad151d9abf0c539f9823bb6406410388df33 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <hussein-atef@hotmail.com>, 2012.
-#   <shiningmoon25@gmail.com>, 2012.
-#  <tarek.taha@gmail.com>, 2013.
+# TYMAH <hussein-atef@hotmail.com>, 2012
+# aboodilankaboot, 2012
+# blackcoder <tarek.taha@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-23 21:50+0000\n"
-"Last-Translator: blackcoder <tarek.taha@gmail.com>\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 265ab2c4dc869a9fa9e4370ddf695e21d017d892..5a28e4f3e46ce96c6068f2f84258717738fc6742 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Семён Гариленко <2507496@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-22 00:03+0100\n"
-"PO-Revision-Date: 2013-03-21 23:03+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -238,9 +241,11 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566
-#: js/share.js:578
+#: 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 ""
 
@@ -260,7 +265,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:606
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
@@ -292,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -320,59 +325,59 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:276
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:311
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:314
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:317
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:323
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:357 js/share.js:553
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:578
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:593
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -395,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -518,37 +526,37 @@ msgstr "Дасведчаны"
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Завяршыць ўстаноўку."
 
@@ -556,37 +564,42 @@ msgstr "Завяршыць ўстаноўку."
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 285e775a32445e269cb6168235e183759b5f639d..ac51487cf2343b528d7c9a1ede8d17ca25cc18e5 100644
--- a/l10n/be/files.po
+++ b/l10n/be/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index f1aff43a6c5a1683710bcbe11a050e005d481451..c0d6dac572734db49621847364b48ce13035d64b 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; 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-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index 016c8149190f930e448856d5afa9ba1afc6280ef..c6f284fc40b2455bcfed4446d72b21a8d3560377 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index c09045efa9b7bfb0877fbea5fe066cf545449ccb..b09ac51eb4d5ff5be8d7efed33cdb95afb3b0f03 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/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-02-15 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index cac41c5f4fb15e29142cc58ffca453f84627d807..41c6a308ab9e306dad13db706d6c883d3350859d 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
diff --git a/l10n/be/files_versions.po b/l10n/be/files_versions.po
index 8b4294e5f202ba0032637496d0b30c6a677aea8c..2ec579f88f7bf46a6c6b63a40c05d4b7924756e8 100644
--- a/l10n/be/files_versions.po
+++ b/l10n/be/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 1759595aea3442911faee8cfe7549778e98b8535..7fe412203cfb19325b84a3e31e9ebf1461921db1 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; 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:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:282 setup.php:386 setup.php:395 setup.php:413 setup.php:423
-#: setup.php:432 setup.php:461 setup.php:527 setup.php:553 setup.php:560
-#: setup.php:571 setup.php:578 setup.php:587 setup.php:595 setup.php:604
-#: setup.php:610
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:283 setup.php:387 setup.php:396 setup.php:414 setup.php:424
-#: setup.php:433 setup.php:462 setup.php:528 setup.php:554 setup.php:561
-#: setup.php:572 setup.php:588 setup.php:596 setup.php:605
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:850
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index dcdbbee1cd2dfab89dffcccfb7f94a322059b380..77d13b3886cdab4bdb687eb6473ec2ad1c8ddae5 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index c807e563d2863707e585c93ed0c4157762bd51ea..9f896e71d17f88e2d9913c67c8f6496e9196b2fc 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; 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 ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/be/user_webdavauth.po b/l10n/be/user_webdavauth.po
index 16028ee79d808030b822e498304ac99d017c26c9..21fb9c8c465f18c49afc00d9d75be30dd9a25d62 100644
--- a/l10n/be/user_webdavauth.po
+++ b/l10n/be/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-02-15 00:05+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index c332b005cd10e6b2a9f81c0d75926ad1b1a14755..1a855bc71b0408ffed61fd89949c4f8f72e35cb2 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <adn.adin@gmail.com>, 2011.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# Stefan Ilivanov <ilivanov@gmail.com>, 2011.
-# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +73,7 @@ msgstr ""
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Няма избрани категории за изтриване"
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -86,155 +82,159 @@ msgstr ""
 
 #: js/config.php:34
 msgid "Sunday"
-msgstr ""
+msgstr "Неделя"
 
 #: js/config.php:35
 msgid "Monday"
-msgstr ""
+msgstr "Понеделник"
 
 #: js/config.php:36
 msgid "Tuesday"
-msgstr ""
+msgstr "Вторник"
 
 #: js/config.php:37
 msgid "Wednesday"
-msgstr ""
+msgstr "Сряда"
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr ""
+msgstr "Четвъртък"
 
 #: js/config.php:39
 msgid "Friday"
-msgstr ""
+msgstr "Петък"
 
 #: js/config.php:40
 msgid "Saturday"
-msgstr ""
+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"
 msgstr "Настройки"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "последните години"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Отказ"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Не"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
-msgstr ""
+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
@@ -287,7 +287,7 @@ msgstr ""
 
 #: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "Споделено с"
 
 #: js/share.js:164
 msgid "Share with link"
@@ -297,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Парола"
 
@@ -347,7 +347,7 @@ msgstr ""
 
 #: js/share.js:325
 msgid "create"
-msgstr ""
+msgstr "създаване"
 
 #: js/share.js:328
 msgid "update"
@@ -400,30 +400,33 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr ""
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Ще получите връзка за нулиране на паролата Ви."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr ""
+msgstr "Потребител"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
-msgstr ""
+msgstr "Нулиране на заявка"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "Вашата парола е нулирана"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -435,7 +438,7 @@ msgstr "Нова парола"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr ""
+msgstr "Нулиране на парола"
 
 #: strings.php:5
 msgid "Personal"
@@ -459,15 +462,15 @@ msgstr "Помощ"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Достъпът е забранен"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "облакът не намерен"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Редактиране на категориите"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -513,95 +516,100 @@ msgstr ""
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Създаване на <strong>админ профил</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr ""
+msgstr "Разширено"
 
 #: templates/installation.php:64
 msgid "Data folder"
-msgstr ""
+msgstr "Директория за данни"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr ""
+msgstr "Конфигуриране на базата"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 ""
+msgstr "ще се ползва"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
-msgstr ""
+msgstr "Потребител за базата"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
-msgstr ""
+msgstr "Парола за базата"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
-msgstr ""
+msgstr "Име на базата"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
-msgstr ""
+msgstr "Хост за базата"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
-msgstr ""
+msgstr "Завършване на настройките"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr "уеб услуги под Ваш контрол"
 
-#: templates/layout.user.php:58
-msgid "Log out"
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/login.php:10
+#: templates/layout.user.php:62
+msgid "Log out"
+msgstr "Изход"
+
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
-msgstr ""
+msgstr "Забравена парола?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
-msgstr ""
+msgstr "запомни"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
-msgstr ""
+msgstr "Вход"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "пред."
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "следващо"
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 4addb9168dbce2660f5bb196df891544ddb04c69..4febe1372485d7d6b61f2ec979782da4030aced3 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Stefan Ilivanov <ilivanov@gmail.com>, 2011,2013.
-# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -29,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 ""
+msgstr "Файлът е качен успешно"
 
 #: ajax/upload.php:27
 msgid ""
@@ -50,15 +44,15 @@ msgstr ""
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Файлът е качен частично"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Фахлът не бе качен"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -80,55 +74,59 @@ msgstr "Невалидна директория."
 msgid "Files"
 msgstr "Файлове"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Споделяне"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "препокриване"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "отказ"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -154,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} файла"
 
+#: 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 "Качване"
@@ -277,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 4ec6da246a3540490bd731e7fc8b3535af2b2212..9bc2e0ee7a6ff8071d76a62b326d241e80e88138 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Записване..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Няма"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index a6df90bcaa31568125d25f24a536f6440f38f78a..005f4be9ca7b2608dfa194f070838909ba5241fb 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -38,26 +37,33 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
+msgstr "Име на папката"
 
 #: templates/settings.php:10
 msgid "External storage"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 0d7fe218e8cb96dcfe99e57b83ab8edb8ca820fb..ea49f21419f1661c0b58f382b2345248708778dc 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:45+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Парола"
 msgid "Submit"
 msgstr "Потвърждение"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s сподели папката %s с Вас"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s сподели файла %s с Вас"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Няма наличен преглед за"
 
-#: templates/public.php:43
+#: 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 8791cd00f69f6147791b0ff3321b33740e6255b6..e391b181a0693d300054824a763c768fbc49df53 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kiril <neohidra@gmail.com>, 2013.
-# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Невъзможно изтриване на %s завинаги"
 msgid "Couldn't restore %s"
 msgstr "Невъзможно възтановяване на %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "извършване на действие по възстановяване"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Грешка"
 
@@ -41,31 +39,31 @@ msgstr "Грешка"
 msgid "delete file permanently"
 msgstr "изтриване на файла завинаги"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} файла"
 
@@ -83,4 +81,4 @@ msgstr "Изтриване"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Изтрити файлове"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index 895db875d9a5bcc9565ba01505ae024ee68f5024..1d86aa6d8d3b10a63b55f9516fc5babdac85959c 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +24,12 @@ msgstr ""
 
 #: 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"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 0ef73e2dd5573e5aaff73bfa89e04f9f6138c46b..7695b0c9dd2e3228178defed66119c535b975b71 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Kiril <neohidra@gmail.com>, 2013.
-# Stefan Ilivanov <ilivanov@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Kiril <neohidra@gmail.com>\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: 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"
@@ -19,47 +17,47 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Помощ"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Лични"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Потребители"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Админ"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Изтеглянето като ZIP е изключено."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Файловете трябва да се изтеглят един по един."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Назад към файловете"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните файлове са прекалено големи за генерирането на ZIP архив."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "не може да се определи"
 
@@ -95,10 +93,6 @@ msgstr "Въведете потребителско име за админист
 msgid "Set an admin password."
 msgstr "Въведете парола за администратор."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Укажете папка за данни"
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,72 +113,76 @@ msgstr "%s, не можете да ползвате точки в името н
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Невалидно PostgreSQL потребителско име и/или парола"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Невалидно Oracle потребителско име и/или парола"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Невалидно MySQL потребителско име и/или парола"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Грешка в базата от данни: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL потребителят '%s'@'localhost' вече съществува"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Изтриване на потребителя от MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL потребителят  '%s'@'%%' вече съществува."
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Изтриване на потребителя от MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Невалидно Oracle потребителско име и/или парола"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
@@ -241,19 +239,6 @@ msgstr "последната година"
 msgid "years ago"
 msgstr "последните години"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s е налична. Получете <a href=\"%s\">повече информация</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "е актуална"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "проверката за обновления е изключена"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 0457ea6caffbdb5c6a249757f1042c52e4d28f6b..f02923ceabc09f8f017fa52ecc8f31fc21da2d8c 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <adn.adin@gmail.com>, 2011.
-# Stefan Ilivanov <ilivanov@gmail.com>, 2011,2013.
-# Yasen Pramatarov <yasen@lindeas.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Възникна проблем с идентификацията"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -47,11 +48,11 @@ msgstr ""
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr ""
+msgstr "Email адреса е записан"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr ""
+msgstr "Невалиден Email адрес"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
@@ -89,7 +90,7 @@ msgstr ""
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Обновяване до {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -119,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr "Обновено"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Записване..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "изтрито"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "нова група"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -234,7 +235,7 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Крон"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
@@ -254,7 +255,7 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Споделяне"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
@@ -315,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr "Покажи настройките за първоначално зареждане отново"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Парола"
 
@@ -422,82 +423,74 @@ msgstr "Нова парола"
 msgid "Change password"
 msgstr "Промяна на паролата"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Екранно име"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Вашия email адрес"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "Въведете е-поща за възстановяване на паролата"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Език"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Помогнете с превода"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Потребител"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Създаване"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Хранилище по подразбиране"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Други"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Хранилище"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 43ed372ee085a76bda2fe35e74711485eda09585..af255ba0488a9d9276653639425526733e23a1ce 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Парола"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помощ"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index c541db398fdb852ae9f80a3e6f2fa46d27932459..fb9b137fdff7ba10148fcff38482b527380eb6ec 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Stefan Ilivanov <ilivanov@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV идентификация"
 
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 ""
+msgstr "ownCloud ще изпрати потребителските данни до този URL. "
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 017d9bfbd8ec56521010d36d267758bf89e86c29..82182636ed728003088676d80f4dec7a462f90cd 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <paul_shubhra@yahoo.com>, 2013.
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +73,7 @@ msgstr "প্রিয়তে %s যোগ করতে সমস্যা দ
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "মুছে ফেলার জন্য কোন ক্যাটেগরি নির্বাচন করা হয় নি ।"
+msgstr "মুছে ফেলার জন্য কনো ক্যাটেগরি নির্বাচন করা হয় নি।"
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -100,7 +98,7 @@ msgstr "বুধবার"
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr "বৃহষ্পতিবার"
+msgstr "বৃহস্পতিবার"
 
 #: js/config.php:39
 msgid "Friday"
@@ -162,75 +160,79 @@ msgstr "ডিসেম্বর"
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr "1 মিনিট পূর্বে"
+msgstr "১ মিনিট পূর্বে"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} মিনিট পূর্বে"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ঘন্টা পূর্বে"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ঘন্টা পূর্বে"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} দিন পূর্বে"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
-msgstr "গতমাস"
+msgstr "গত মাস"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} মাস পূর্বে"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "বেছে নিন"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "বাতির"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "না"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "না"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "তথাস্তু"
 
@@ -295,7 +297,7 @@ msgstr "লিংকের সাথে ভাগাভাগি কর"
 msgid "Password protect"
 msgstr "কূটশব্দ সুরক্ষিত"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "কূটশব্দ"
 
@@ -333,7 +335,7 @@ msgstr "{user} এর সাথে {item} ভাগাভাগি করা হ
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "ভাগাভাগি বাতিল কর"
+msgstr "ভাগাভাগি বাতিল "
 
 #: js/share.js:320
 msgid "can edit"
@@ -398,24 +400,27 @@ msgstr "ownCloud কূটশব্দ পূনঃনির্ধারণ"
 msgid "Use the following link to reset your password: {link}"
 msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "পূনঃনির্ধারণ ই-মেইল পাঠানো হয়েছে।"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "অনুরোধ ব্যর্থ !"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "ব্যবহারকারী"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "অনুরোধ পূনঃনির্ধারণ"
 
@@ -445,7 +450,7 @@ msgstr "ব্যবহারকারী"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "অ্যাপস"
+msgstr "অ্যাপ"
 
 #: strings.php:8
 msgid "Admin"
@@ -521,75 +526,80 @@ msgstr "সুচারু"
 msgid "Data folder"
 msgstr "ডাটা ফোল্ডার "
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ডাটাবেচ কনফিগার করুন"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ডাটাবেজ ব্যবহারকারী"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ডাটাবেজ কূটশব্দ"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ডাটাবেজের নাম"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ডাটাবেজ টেবলস্পেস"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "ডাটাবেজ হোস্ট"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "সেটআপ সুসম্পন্ন কর"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "ওয়েব সার্ভিসের নিয়ন্ত্রণ আপনার হাতের মুঠোয়"
+msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "প্রস্থান"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "কূটশব্দ হারিয়েছেন?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "মনে রাখ"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "প্রবেশ"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 04badc5e7f5d4b0880c54f77f424d1f076628e31..2b55e51fc89ca1af222d5dfdb5b99071550f1b11 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -28,17 +27,13 @@ msgstr "%s কে স্থানান্তর করা সম্ভব হ
 msgid "Could not move %s"
 msgstr "%s  কে স্থানান্তর করা সম্ভব হলো না"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ফাইলের নাম পরিবর্তন করা সম্ভব হলো না"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যা অজ্ঞাত।"
+msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "কোন সমস্যা নেই, ফাইল আপলোড সুসম্পন্ন হয়েছে"
+msgstr "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।"
 
 #: ajax/upload.php:27
 msgid ""
@@ -49,7 +44,7 @@ msgstr "আপলোড করা  ফাইলটি php.ini তে বর্
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "আপলোড করা ফাইলটি HTML  ফর্মে নির্ধারিত  MAX_FILE_SIZE নির্দেশিত সর্বোচ্চ আকার অতিক্রম করেছে "
+msgstr "আপলোড করা ফাইলটি  HTML  ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার  অতিক্রম করতে চলেছে "
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -61,7 +56,7 @@ msgstr "কোন ফাইল আপলোড করা হয় নি"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "অস্থায়ী ফোল্ডার খোয়া গিয়েছে"
+msgstr "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -79,55 +74,59 @@ msgstr "ভুল ডিরেক্টরি"
 msgid "Files"
 msgstr "ফাইল"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "ভাগাভাগি কর"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "মুছে ফেল"
+msgstr "মুছে"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "প্রতিস্থাপন"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "নাম সুপারিশ করুন"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "১টি ফাইল আপলোড করা হচ্ছে"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "আপনার ফাইলটি আপলোড করা সম্ভব হলো না, কেননা এটি হয় একটি ফোল্ডার কিংবা এর আকার ০ বাইট"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ফাঁকা রাখা যাবে না।"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "নাম"
+msgstr "রাম"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
+#: 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 "আপলোড"
@@ -250,7 +257,7 @@ msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ 
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "সংরক্ষন কর"
+msgstr "সংরক্ষণ"
 
 #: templates/index.php:7
 msgid "New"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
 
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 7c8a89fc3b7a199225ab7099eece613a103fe572..3b9c0439d515a0c84af43d52a7b08fab2aa03d65 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "সংরক্ষণ করা হচ্ছে.."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "কোনটিই নয়"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 840f97b24990cc11e07b6ecc801644b40c68e2aa..cfb952a4853baf763d33ebcd639ff0bdb4fa22dd 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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr "দয়া করে সঠিক এবং বৈধ Dropbox app key and
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
 
-#: lib/config.php:423
+#: 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:426
+#: 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 "বাহ্যিক সংরক্ষণাগার"
@@ -97,7 +104,7 @@ msgstr "ব্যবহারকারী"
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "মুছে ফেল"
+msgstr "মুছে"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index 55a97e9d95cc3b6b59099a078178e94d73ec069e..982c0e344354782414d77e95a76b727c562b84d8 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 09:58+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,26 +23,26 @@ msgstr "কূটশব্দ"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr "জমা দাও"
+msgstr "জমা দিন"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
 
-#: templates/public.php:43
+#: 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 4b31e77806204cba78ba64536d0d507a29312df0..322ba4bd5ffeb65c6ee00f6ac97fe421f09347e4 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "সমস্যা"
 
@@ -39,31 +39,31 @@ msgstr "সমস্যা"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "রাম"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 446a2d3471cbb16ae0b862435f561fccf9389813..7bc652b6c84833aab793db37f66fddb5a1987208 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index f402fcbb336ed31b0cd7a6b50c6f8bece481f1f2..598def15f0e0b75249dfab20462fe41a35894ad1 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
-msgstr "ব্যভহারকারী"
+msgstr "ব্যবহারকারী"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "অ্যাপ"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
-msgstr "প্রশাসক"
+msgstr "প্রশাসন"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "ফাইলে ফিরে চল"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "নির্বাচিত ফাইলগুলো এতই বৃহৎ যে জিপ ফাইল তৈরী করা সম্ভব নয়।"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -79,7 +79,7 @@ msgstr "ফাইল"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
-msgstr ""
+msgstr "টেক্সট"
 
 #: search/provider/file.php:29
 msgid "Images"
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr "গত বছর"
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s এখন সুলভ।  <a href=\"%s\">আরও জানুন</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "সর্বশেষ"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "পরিবর্ধন পরীক্ষণ করা বন্ধ রাখা হয়েছে"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 05f219903a79d63b2fc8d50d1cf2a04567ede97c..b07fc191521d993aa69b063a3f86bbe597d8206c 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "অনুমোদন ঘটিত সমস্যা"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -65,7 +68,7 @@ msgstr "ভাষা পরিবর্তন করা হয়েছে"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "অনুরোধটি যথাযথ নয়"
+msgstr "অনুরোধটি সঠিক নয়"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "গোষ্ঠীসমূহ"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "গোষ্ঠী প্রশাসক"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "মুছে ফেল"
+msgstr "মুছে"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -313,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "কূটশব্দ"
 
@@ -420,82 +423,74 @@ msgstr "নতুন কূটশব্দ"
 msgid "Change password"
 msgstr "কূটশব্দ পরিবর্তন করুন"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "ই-মেইল "
+msgstr "ইমেইল"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "আপনার ই-মেইল ঠিকানা"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "ভাষা"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "অনুবাদ করতে সহায়তা করুন"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "তৈরী কর"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "পূর্বনির্ধারিত সংরক্ষণাগার"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "অসীম"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "সংরক্ষণাগার"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "পূর্বনির্ধারিত"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 9619227c80a8122be08d73cb3e22f2cb48b817e5..1613ef51b97919b33b039781dd2b196e7e8c64a9 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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "হোস্ট"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ভিত্তি  DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "ব্যবহারকারি  DN"
 
-#: templates/settings.php:45
+#: 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 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জন্য  DN এবং কূটশব্দটি ফাঁকা রাখুন।"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ব্যবহারকারির প্রবেশ ছাঁকনী"
 
-#: templates/settings.php:53
+#: 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 "প্রবেশের  চেষ্টা করার সময় প্রযোজ্য ছাঁকনীটি নির্ধারণ করবে। প্রবেশের সময় ব্যবহারকারী নামটি %%uid  দিয়ে প্রতিস্থাপিত হবে।"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid স্থানধারক ব্যবহার করুন, উদাহরণঃ  \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ব্যবহারকারী তালিকা ছাঁকনী"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ব্যবহারকারী উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "কোন স্থানধারক ব্যতীত, যেমনঃ \"objectClass=person\"।"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "গোষ্ঠী ছাঁকনী"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "গোষ্ঠীসমূহ উদ্ধার করার সময় প্রয়োগের জন্য ছাঁকনী নির্ধারণ করবে।"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "কোন স্থান ধারক ব্যতীত, উদাহরণঃ\"objectClass=posixGroup\"।"
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "পোর্ট"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS ব্যবহার কর"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "শুধুমাত্র যদি এই বিকল্পটি ব্যবহার করেই সংযোগ কার্যকরী হয় তবে আপনার ownCloud সার্ভারে LDAP সার্ভারের SSL সনদপত্রটি আমদানি করুন।"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "অনুমোদিত নয়, শুধুমাত্র পরীক্ষামূলক ব্যবহারের জন্য।"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ব্যবহারকারীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ভিত্তি ব্যবহারকারি বৃক্ষাকারে"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "গোষ্ঠীর ownCloud নাম তৈরি করার জন্য ব্যভহৃত LDAP বৈশিষ্ট্য।"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ভিত্তি গোষ্ঠী বৃক্ষাকারে"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "বাইটে"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "সহায়িকা"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 6bf9079f19bb0285006dd7aa490cbdde3efaed66..1768f6474f044b017003815604eeffd9bc32bcfe 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Shubhra Paul <paul_shubhra@yahoo.com>, 2013.
+# Shubhra Paul <paul_shubhra@yahoo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr "URL:http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 24cd6be2c3bc1170f41d29fa78059bbca8aab845..b7bc551417d57faa135b5ba4f80ae16bcf9668ad 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <joan@montane.cat>, 2012.
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2011-2013.
-#  <sacoo2@hotmail.com>, 2013.
+# rogerc, 2013
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -162,77 +160,81 @@ msgstr "Desembre"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Arranjament"
+msgstr "Configuració"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "anys enrere"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Escull"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "No"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "D'acord"
 
@@ -297,7 +299,7 @@ msgstr "Comparteix amb enllaç"
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -311,11 +313,11 @@ msgstr "Envia"
 
 #: js/share.js:178
 msgid "Set expiration date"
-msgstr "Estableix la data d'expiració"
+msgstr "Estableix la data de venciment"
 
 #: js/share.js:179
 msgid "Expiration date"
-msgstr "Data d'expiració"
+msgstr "Data de venciment"
 
 #: js/share.js:211
 msgid "Share via email:"
@@ -367,11 +369,11 @@ msgstr "Protegeix amb contrasenya"
 
 #: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "Error en eliminar la data d'expiració"
+msgstr "Error en eliminar la data de venciment"
 
 #: js/share.js:589
 msgid "Error setting expiration date"
-msgstr "Error en establir la data d'expiració"
+msgstr "Error en establir la data de venciment"
 
 #: js/share.js:604
 msgid "Sending ..."
@@ -400,24 +402,27 @@ msgstr "estableix de nou la contrasenya Owncloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Useu l'enllaç següent per restablir la contrasenya: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
+#: 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 "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "S'ha enviat el correu reinicialització"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "El requeriment ha fallat!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Sol·licita reinicialització"
 
@@ -451,7 +456,7 @@ msgstr "Aplicacions"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrador"
+msgstr "Administració"
 
 #: strings.php:9
 msgid "Help"
@@ -523,37 +528,37 @@ msgstr "Avançat"
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "s'usarà"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
@@ -561,37 +566,42 @@ msgstr "Acaba la configuració"
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Surt"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "L'ha rebutjat l'acceditació automàtica!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Canvieu la contrasenya de nou per assegurar el vostre compte."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "recorda'm"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Inici de sessió"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 4d95f585ff0c768847621262d4708a2eadaa73d8..436ee3aec70488bccd42565df5c6a5f61237086f 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bury1000@gmail.com>, 2012.
-#   <joan@montane.cat>, 2012.
-#   <josep_tomas@hotmail.com>, 2012.
-# Josep Tomàs <jtomas.binsoft@gmail.com>, 2012.
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2011-2013.
-#   <sacoo2@hotmail.com>, 2013.
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:08+0200\n"
-"PO-Revision-Date: 2013-04-10 14:46+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -34,17 +28,13 @@ msgstr "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom"
 msgid "Could not move %s"
 msgstr " No s'ha pogut moure %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "No es pot canviar el nom del fitxer"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "El fitxer s'ha pujat correctament"
+msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
 #: ajax/upload.php:27
 msgid ""
@@ -55,19 +45,19 @@ msgstr "L’arxiu que voleu carregar supera el màxim definit en la directiva up
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
+msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "El fitxer només s'ha pujat parcialment"
+msgstr "El fitxer només s'ha carregat parcialment"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "El fitxer no s'ha pujat"
+msgstr "No s'ha carregat cap fitxer"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "S'ha perdut un fitxer temporal"
+msgstr "Falta un fitxer temporal"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -85,55 +75,59 @@ msgstr "Directori no vàlid."
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Comparteix"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "Suprimeix"
+msgstr "Esborra"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pendents"
+msgstr "Pendent"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "executa d'operació d'esborrar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fitxers pujant"
 
@@ -159,69 +153,77 @@ msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden ac
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "No hi ha prou espai disponible"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fitxers"
 
+#: lib/app.php:53
+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"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "No es pot canviar el nom del fitxer"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Puja"
@@ -282,37 +284,37 @@ msgstr "Fitxers esborrats"
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "No teniu permisos d'escriptura aquí."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Actualment escanejant"
 
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 98f7c39d55d97267260364d1d740c03dbae29787..10fc22da5c65d5599056d6e8c0f91a22f4097b8b 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2012.
+# 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +18,87 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Desant..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
-msgstr "Encriptatge"
+msgstr "Xifrat"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "L'encriptació de fitxers està activada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Els tipus de fitxers següents no s'encriptaran:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Exclou els tipus de fitxers següents de l'encriptatge:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Cap"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 570b6de8396723752098339ac2ba5f041c35be65..db9e5dfb76020c37682f7939674aed3cd0c9b652 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2012.
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -39,19 +38,26 @@ msgstr "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Error en configurar l'emmagatzemament Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:426
+#: 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 "<b>Avís:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li."
 
+#: 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 "<b>Avís:</b>El suport Curl de PHP no està activat o instal·lat. No es pot muntar ownCloud / WebDAV o GoogleDrive. Demaneu a l'administrador que l'instal·li."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Emmagatzemament extern"
@@ -99,7 +105,7 @@ msgstr "Usuaris"
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "Elimina"
+msgstr "Esborra"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 682f63bb56b516691a90306c35828cfe98ddd936..4ba839ce6a2250a6a94bcfb454c66204be5253ec 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 02:02+0200\n"
-"PO-Revision-Date: 2012-10-01 08:50+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Contrasenya"
 msgid "Submit"
 msgstr "Envia"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha compartit la carpeta %s amb vós"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha compartit el fitxer %s amb vós"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "No hi ha vista prèvia disponible per a"
 
-#: templates/public.php:37
+#: 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 9d9af8c97393e1e09ecd0e8ad9e9a8eefcca6e93..ce490a2e470dfff3ea853ba4d189e3e2750e72bd 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rcalvoi@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "No s'ha pogut esborrar permanentment %s"
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "executa l'operació de restauració"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Error"
 
@@ -40,31 +39,31 @@ msgstr "Error"
 msgid "delete file permanently"
 msgstr "esborra el fitxer permanentment"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} fitxers"
 
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 8aeff6e34cd440b4c48d685cbf63d66ca90c6a79..c1e4d1db8d646f91c09239b8435899f5c3f613bf 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <josep_tomas@hotmail.com>, 2012.
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 11:20+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
 "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"
@@ -43,11 +40,11 @@ msgstr "fallada"
 msgid "File %s could not be reverted to version %s"
 msgstr "El fitxer %s no s'ha pogut revertir a la versió %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "No hi ha versións antigues disponibles"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "No heu especificat el camí"
 
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 36b660ecaf053c470ac3ab5a7faf5ecfe8f2bc19..5df27e16b8f026df12087432a3cbd4b5c7cde1c2 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2012-2013.
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -19,47 +18,47 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Configuració"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usuaris"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicacions"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administració"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP està desactivada."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "no s'ha pogut determinar"
 
@@ -95,10 +94,6 @@ msgstr "Establiu un nom d'usuari per l'administrador."
 msgid "Set an admin password."
 msgstr "Establiu una contrasenya per l'administrador."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Especifiqueu una carpeta de dades."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "No s'ha pogut establir la connexió Oracle"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya MySQL no vàlids"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "L'ordre en conflicte és: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Elimina aquest usuari de MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Elimina aquest usuari de MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
@@ -239,20 +238,7 @@ msgstr "l'any passat"
 
 #: template.php:124
 msgid "years ago"
-msgstr "fa anys"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s està disponible. Obtén <a href=\"%s\">més informació</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "actualitzat"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "la comprovació d'actualitzacions està desactivada"
+msgstr "anys enrere"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index f3570ed8d4a7e17efd9bbcb461345e4ad20b806b..032f43b74c722a7e7c0823c1db3a8fea667cb0f8 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,19 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bury1000@gmail.com>, 2012.
-#   <joan@montane.cat>, 2012.
-#   <josep_tomas@hotmail.com>, 2012.
-# Josep Tomàs <jtomas.binsoft@gmail.com>, 2012.
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2011-2012.
+# rogerc, 2013
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -27,12 +23,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "No s'ha pogut carregar la llista des de l'App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error d'autenticació"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "El nom a mostrar ha canviat."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "No s'ha pogut canviar el nom a mostrar"
 
@@ -70,7 +70,7 @@ msgstr "S'ha canviat l'idioma"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Sol.licitud no vàlida"
+msgstr "Sol·licitud no vàlida"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -100,7 +100,7 @@ msgstr "Desactiva"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Activa"
+msgstr "Habilita"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -122,52 +122,52 @@ msgstr "Error en actualitzar l'aplicació"
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "S'està desant..."
+msgstr "Desant..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "esborrat"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "desfés"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grups"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "Suprimeix"
+msgstr "Esborra"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "afegeix grup"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Heu de facilitar un nom d'usuari vàlid"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Error en crear l'usuari"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Català"
 
@@ -318,19 +318,19 @@ msgstr "Registre"
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +401,7 @@ msgstr "Obtén les aplicacions per sincronitzar fitxers"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -425,82 +425,74 @@ msgstr "Contrasenya nova"
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nom a mostrar"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "El vostre nom a mostrar ha canviat"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "No s'ha pogut canviar el vostre nom a mostrar"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Canvia el nom a mostrar"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nom d'accés"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperació de contrasenya d'administrador"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Emmagatzemament per defecte"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Il·limitat"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Un altre"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Emmagatzemament"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "canvia el nom a mostrar"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "estableix nova contrasenya"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index e04cdeb3dd7643f37849a45261fffc61792137d4..cb56954f9f0d6dc3cbc77b7f489d72de663333ea 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rcalvoi@yahoo.com>, 2013.
-#   <rcalvoi@yahoo.com>, 2012-2013.
+# rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -19,6 +18,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Ha fallat en eliminar els mapatges"
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Ha fallat en eliminar la configuració del servidor"
@@ -55,281 +58,363 @@ msgstr "Voleu mantenir la configuració?"
 msgid "Cannot add server configuration"
 msgstr "No es pot afegir la configuració del servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "s'han eliminat els mapatges"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Èxit"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "La prova de connexió ha reeixit"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "La prova de connexió ha fallat"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Voleu eliminar la configuració actual del servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirma l'eliminació"
 
-#: templates/settings.php:8
+#: 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 "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
 
-#: templates/settings.php:11
+#: 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 "<b>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuració del servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Afegeix la configuració del servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
-msgstr "Màquina"
+msgstr "Equip remot"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Una DN Base per línia"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Usuari"
 
-#: templates/settings.php:45
+#: 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 "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtre d'inici de sessió d'usuari"
 
-#: templates/settings.php:53
+#: 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 "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Llista de filtres d'usuari"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtre de grup"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defineix el filtre a aplicar quan es mostren grups."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Arranjaments de connexió"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuració activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si està desmarcat, aquesta configuració s'ometrà."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Màquina de còpia de serguretat (rèplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port de la còpia de seguretat (rèplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactiva el servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Quan està connectat, ownCloud només es connecta al servidor de la rèplica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validació de certificat SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomanat, ús només per proves."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Memòria de cau Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Arranjaments de carpetes"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Una DN Base d'Usuari per línia"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributs de cerca d'usuari"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Un atribut per línia"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Una DN Base de Grup per línia"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributs de cerca de grup"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associació membres-grup"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributs especials"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Camp de quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota per defecte"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Camp de correu electrònic"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Norma per anomenar la carpeta arrel d'usuari"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nom d'usuari intern"
+
+#: 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 "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home a ownCloud. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atribut nom d'usuari intern:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Sobrescriu la detecció UUID"
+
+#: 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 "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran en els usuaris i grups LDAP mapats de nou (afegits)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atribut UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
+
+#: 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 "ownCloud utilitza els noms d'usuari per emmagatzemar i assignar (meta)dades. per tal d'identificar usuaris de forma precisa, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix un mapatge del nom d'usuari ownCloud a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. Addicionalment, la DN es desa a la memòria de cau per reduïr la interacció LDAP, però no s'usa per a identificació. Si la DN canvia, els canvis són detectats per ownCloud. El nom d'usuari intern ownCloud s'utilitza internament arreu de ownCloud. Eliminar els mapatges tindrà efectues per tot arreu. L'eliminació dels mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No elimineu mai els mapatges en un entorn de producció. Elimineu-los només en un estadi experimental o de prova."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Comprovació de la configuració"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index bd7df15438f42dbfd1dc3219f0fcd09768d8f727..66136ea54afafc078361f1b4b567285892403b28 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2012-2013.
+# rogerc, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 07:22+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
 "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"
@@ -26,7 +26,7 @@ msgstr "Autenticació WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 74638f38be8e34561e24e0be2e7ba8d9b02d570e..f752fb55991c3ddaeb57511ae6683dcdbd85f762 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jan Krejci <krejca85@gmail.com>, 2011.
-# Martin  <fireball@atlas.cz>, 2011-2012.
-# Michal Hrušecký <Michal@hrusecky.net>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -164,75 +161,79 @@ msgstr "Prosinec"
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "před minutou"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "před {minutes} minutami"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "před hodinou"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "před {hours} hodinami"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "před {days} dny"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
-msgstr "minulý mesíc"
+msgstr "minulý měsíc"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "před {months} měsíci"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "před lety"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Vybrat"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ano"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ne"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -297,7 +298,7 @@ msgstr "Sdílet s odkazem"
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
@@ -375,7 +376,7 @@ msgstr "Chyba při nastavení data vypršení platnosti"
 
 #: js/share.js:604
 msgid "Sending ..."
-msgstr "Odesílám..."
+msgstr "Odesílám ..."
 
 #: js/share.js:615
 msgid "Email sent"
@@ -400,24 +401,27 @@ msgstr "Obnovení hesla pro ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Heslo obnovíte použitím následujícího odkazu: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Bude Vám e-mailem zaslán odkaz pro obnovu hesla."
+#: 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 "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Obnovovací e-mail odeslán."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Požadavek selhal."
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Bude Vám e-mailem zaslán odkaz pro obnovu hesla."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Vyžádat obnovu"
 
@@ -523,75 +527,80 @@ msgstr "Pokročilé"
 msgid "Data folder"
 msgstr "Složka s daty"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nastavit databázi"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "bude použito"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Heslo databáze"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tabulkový prostor databáze"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Hostitel databáze"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "webové služby pod Vaší kontrolou"
+msgstr "služby webu pod Vaší kontrolou"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Odhlásit se"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatické přihlášení odmítnuto."
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ztratili jste své heslo?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "zapamatovat"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Přihlásit"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternativní přihlášení"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 965e689bbf70157211a37d9a78ae73530e781fd2..1212b63feb12a19ee24f36fdba060af89dcf3a6a 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2011-2012.
-# Michal Hrušecký <Michal@hrusecky.net>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 07:30+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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"
 "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"
@@ -30,10 +27,6 @@ msgstr "Nelze přesunout %s - existuje soubor se stejným názvem"
 msgid "Could not move %s"
 msgstr "Nelze přesunout %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nelze přejmenovat soubor"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslán. Neznámá chyba"
@@ -81,55 +74,59 @@ msgstr "Neplatný adresář"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Sdílet"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Čekající"
+msgstr "Nevyřízené"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "provést smazání"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "odesílá se 1 soubor"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "soubory se odesílají"
 
@@ -155,69 +152,77 @@ msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubo
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů"
+msgstr "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nedostatek dostupného místa"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nemůže být prázdná"
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Změněno"
+msgstr "Upraveno"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} soubory"
 
+#: 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 "Nelze přejmenovat soubor"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Odeslat"
@@ -278,37 +283,37 @@ msgstr "Odstraněné soubory"
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nemáte zde práva zápisu."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Odeslaný soubor je příliš velký"
+msgstr "Odesílaný soubor je příliš velký"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
 
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 566eff0e84ab5771fa773761edcb96b4f8fb35ff..6c2fa91ab96e4054cee70e3f48fb9194dbe6b335 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Ukládám..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifrování je povoleno."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Následující typy souborů nebudou šifrovány:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Vyjmout následující typy souborů ze šifrování:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Žádné"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 74fc664212623ca4a1d8c6ce65d4c8284b4f8994..993ed7edf8e0be98b4ddaab5668921566351db8f 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jan Krejci <krejca85@gmail.com>, 2012.
-# Martin  <fireball@atlas.cz>, 2012.
-# Michal Hrušecký <Michal@hrusecky.net>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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"
 "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"
@@ -41,19 +37,26 @@ msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbo
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba při nastavení úložiště Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje."
 
-#: lib/config.php:426
+#: 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 "<b>Varování:</b> není nainstalována, nebo povolena, podpora FTP v PHP. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje."
 
+#: 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 "<b>Varování:</b> není nainstalována, nebo povolena, podpora Curl v PHP. Není možné připojení oddílů ownCloud, WebDAV, či GoogleDrive. Prosím požádejte svého správce systému ať ji nainstaluje."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externí úložiště"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index bf14914d7660317ea07413f42b592e5ad8787204..1f16d54c480bec97cc1ded57bbb1bdbaa1626e7a 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2012.
-# Michal Hrušecký <Michal@hrusecky.net>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 11:59+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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"
 "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"
@@ -28,24 +25,24 @@ msgstr "Heslo"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s s Vámi sdílí složku %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s s Vámi sdílí soubor %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Náhled není dostupný pro"
 
-#: templates/public.php:37
+#: 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 0b7136d9364d9315c64ee4b7cdc0f4ed4402d700..c4dd41f482cc386dcaf1f2240b3e901271729762 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -3,13 +3,12 @@
 # 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Nelze trvale odstranit %s"
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "provést obnovu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Chyba"
 
@@ -40,31 +39,31 @@ msgstr "Chyba"
 msgid "delete file permanently"
 msgstr "trvale odstranit soubor"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Název"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} soubory"
 
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 30a2abc5e8006cfab92f105ef2c81068294bd99f..11930a8b793d8417ce25bed12750ed3efa6bdf51 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 07:20+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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"
 "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"
@@ -42,11 +40,11 @@ msgstr "sehlhání"
 msgid "File %s could not be reverted to version %s"
 msgstr "Soubor %s nemohl být navrácen na verzi %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Nejsou dostupné žádné starší verze"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nezadána cesta"
 
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 85be4f27712ade5768bd908b4c4b6092e221ac8f..3a078431767d16f627828ef671b68e0d5b8f9f18 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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: 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,47 +17,47 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Nápověda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Osobní"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Nastavení"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Uživatelé"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplikace"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administrace"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Stahování ZIPu je vypnuto."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musí být stahovány jednotlivě."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nelze zjistit"
 
@@ -95,10 +93,6 @@ msgstr "Zadejte uživatelské jméno správce."
 msgid "Set an admin password."
 msgstr "Zadejte heslo správce."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Určete složku dat."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,83 +113,87 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo PostgreSQL není platné"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Uživatelské jméno, či heslo Oracle není platné"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo MySQL není platné"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podezřelý příkaz byl: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Zahodit uživatele z MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Zahodit uživatele z MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Uživatelské jméno, či heslo Oracle není platné"
+
+#: setup.php:592 setup.php:624
 #, 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:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "před vteřinami"
+msgstr "před pár vteřinami"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "před 1 minutou"
+msgstr "před minutou"
 
 #: template.php:115
 #, php-format
@@ -235,25 +233,12 @@ msgstr "Před %d měsíci"
 
 #: template.php:123
 msgid "last year"
-msgstr "loni"
+msgstr "minulý rok"
 
 #: template.php:124
 msgid "years ago"
 msgstr "před lety"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s je dostupná. Získat <a href=\"%s\">více informací</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "aktuální"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "kontrola aktualizací je vypnuta"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index fa50cfa0154be467268ba9776c97dd1c529d09e9..d0e6d27677637a41b37d3f005eeae4a08d586cf9 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,18 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <icewind1991@gmail.com>, 2012.
-# Jan Krejci <krejca85@gmail.com>, 2011-2012.
-# Martin  <fireball@atlas.cz>, 2011-2012.
-# Michal Hrušecký <Michal@hrusecky.net>, 2012.
-#   <Michal@hrusecky.net>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nelze načíst seznam z App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Chyba ověření"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Vaše zobrazované jméno bylo změněno."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Nelze změnit zobrazované jméno"
 
@@ -122,52 +120,52 @@ msgstr "Chyba při aktualizaci aplikace"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ukládám..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "smazáno"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "zpět"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nelze odebrat uživatele"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Správa skupiny"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "přidat skupinu"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Musíte zadat platné uživatelské jméno"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Chyba při vytváření užiatele"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Musíte zadat platné heslo"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "ÄŒesky"
 
@@ -318,19 +316,19 @@ msgstr "Záznam"
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +399,7 @@ msgstr "Získat aplikace pro synchronizaci vašich souborů"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Heslo"
 
@@ -425,82 +423,74 @@ msgstr "Nové heslo"
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Vaše zobrazované jméno bylo změněno"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Nelze změnit vaše zobrazované jméno"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Změnit zobrazované jméno"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Vytvořit"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Výchozí úložiště"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "NeomezenÄ›"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "Jiná"
+msgstr "Jiný"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Úložiště"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "změnit zobrazované jméno"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "nastavit nové heslo"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Výchozí"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 659bcb2da7cad2dcda5aa4cc6d5bb3d2722bd76c..9591f0e61112e46ada0f6acf107cb1ca80f8b4d0 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2012.
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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"
 "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,6 +17,10 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 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 "Selhalo smazání nastavení serveru"
@@ -55,281 +57,363 @@ msgstr "Ponechat nastavení?"
 msgid "Cannot add server configuration"
 msgstr "Nelze přidat nastavení serveru"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Úspěch"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Chyba"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test spojení byl úspěšný"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Test spojení selhal"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Opravdu si přejete smazat současné nastavení serveru?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potvrdit smazání"
 
-#: templates/settings.php:8
+#: 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 "<b>Varování:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilní. Může nastávat neočekávané chování. Požádejte, prosím, správce systému aby jednu z nich zakázal."
 
-#: templates/settings.php:11
+#: 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 "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému aby jej nainstaloval."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Nastavení serveru"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Přidat nastavení serveru"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Počítač"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Základní DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedna základní DN na řádku"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uživatelské DN"
 
-#: templates/settings.php:45
+#: 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 "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtr přihlášení uživatelů"
 
-#: templates/settings.php:53
+#: 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 "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtr uživatelských seznamů"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Určuje použitý filtr, pro získávaní uživatelů."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znaků, např. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtr skupin"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Určuje použitý filtr, pro získávaní skupin."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavení spojení"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Nastavení aktivní"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Pokud není zaškrtnuto, bude nastavení přeskočeno."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Záložní (kopie) hostitel"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Záložní (kopie) port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Zakázat hlavní serveru"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Při zapnutí se ownCloud připojí pouze k záložnímu serveru"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívejte pro spojení LDAP, selže."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ověřování SSL certifikátu."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Není doporučeno, pouze pro testovací účely."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "TTL vyrovnávací paměti"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavení adresáře"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole pro zobrazované jméno uživatele"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Základní uživatelský strom"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jedna uživatelská základní DN na řádku"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributy vyhledávání uživatelů"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Volitelné, atribut na řádku"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole pro zobrazení jména skupiny"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Základní skupinový strom"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základní DN na řádku"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributy vyhledávání skupin"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociace člena skupiny"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Speciální atributy"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole pro kvótu"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Výchozí kvóta"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole e-mailu"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pojmenování domovské složky uživatele"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
 
-#: templates/settings.php:99
+#: 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 "Vyzkoušet nastavení"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 28b3d2f8f195622c352a2d3d9de5d44ff002be4e..420758436b0489b07961ab1da1aa04aa0714c8a9 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 09:06+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\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"
 "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"
@@ -26,7 +26,7 @@ msgstr "Ověření WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..5c485a661506af5902d1f84f3d5476255e6f2d14
--- /dev/null
+++ b/l10n/cy_GB/core.po
@@ -0,0 +1,618 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# ubuntucymraeg <owen.llywelyn@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+#: 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"
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr "Math o gategori heb ei ddarparu."
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr "Dim categori i'w ychwanegu?"
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr "Mae'r categori hwn eisoes yn bodoli: %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 "Math o wrthrych heb ei ddarparu."
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr "%s ID heb ei ddarparu."
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr "Gwall wrth ychwanegu %s at ffefrynnau."
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr "Ni ddewiswyd categorïau i'w dileu."
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr "Gwall wrth dynnu %s o ffefrynnau."
+
+#: js/config.php:34
+msgid "Sunday"
+msgstr "Sul"
+
+#: js/config.php:35
+msgid "Monday"
+msgstr "Llun"
+
+#: js/config.php:36
+msgid "Tuesday"
+msgstr "Mawrth"
+
+#: js/config.php:37
+msgid "Wednesday"
+msgstr "Mercher"
+
+#: js/config.php:38
+msgid "Thursday"
+msgstr "Iau"
+
+#: js/config.php:39
+msgid "Friday"
+msgstr "Gwener"
+
+#: js/config.php:40
+msgid "Saturday"
+msgstr "Sadwrn"
+
+#: js/config.php:45
+msgid "January"
+msgstr "Ionawr"
+
+#: js/config.php:46
+msgid "February"
+msgstr "Chwefror"
+
+#: js/config.php:47
+msgid "March"
+msgstr "Mawrth"
+
+#: js/config.php:48
+msgid "April"
+msgstr "Ebrill"
+
+#: js/config.php:49
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:50
+msgid "June"
+msgstr "Mehefin"
+
+#: js/config.php:51
+msgid "July"
+msgstr "Gorffennaf"
+
+#: js/config.php:52
+msgid "August"
+msgstr "Awst"
+
+#: js/config.php:53
+msgid "September"
+msgstr "Medi"
+
+#: js/config.php:54
+msgid "October"
+msgstr "Hydref"
+
+#: js/config.php:55
+msgid "November"
+msgstr "Tachwedd"
+
+#: js/config.php:56
+msgid "December"
+msgstr "Rhagfyr"
+
+#: js/js.js:286
+msgid "Settings"
+msgstr "Gosodiadau"
+
+#: js/js.js:718
+msgid "seconds ago"
+msgstr "eiliad yn ôl"
+
+#: js/js.js:719
+msgid "1 minute ago"
+msgstr "1 munud yn ôl"
+
+#: js/js.js:720
+msgid "{minutes} minutes ago"
+msgstr "{minutes} munud yn ôl"
+
+#: js/js.js:721
+msgid "1 hour ago"
+msgstr "1 awr yn ôl"
+
+#: js/js.js:722
+msgid "{hours} hours ago"
+msgstr "{hours} awr yn ôl"
+
+#: js/js.js:723
+msgid "today"
+msgstr "heddiw"
+
+#: js/js.js:724
+msgid "yesterday"
+msgstr "ddoe"
+
+#: js/js.js:725
+msgid "{days} days ago"
+msgstr "{days} diwrnod yn ôl"
+
+#: js/js.js:726
+msgid "last month"
+msgstr "mis diwethaf"
+
+#: js/js.js:727
+msgid "{months} months ago"
+msgstr "{months} mis yn ôl"
+
+#: js/js.js:728
+msgid "months ago"
+msgstr "misoedd yn ôl"
+
+#: js/js.js:729
+msgid "last year"
+msgstr "y llynedd"
+
+#: js/js.js:730
+msgid "years ago"
+msgstr "blwyddyn yn ôl"
+
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Dewisiwch"
+
+#: js/oc-dialogs.js:122
+msgid "Cancel"
+msgstr "Diddymu"
+
+#: 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 "Ie"
+
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Na"
+
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr "Iawn"
+
+#: 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 "Nid yw'r math o wrthrych wedi cael ei nodi."
+
+#: 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 "Gwall"
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr "Nid yw enw'r pecyn wedi cael ei nodi."
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr "Nid yw'r ffeil ofynnol {file} wedi ei gosod!"
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr "Rhannwyd"
+
+#: js/share.js:90
+msgid "Share"
+msgstr "Rhannu"
+
+#: js/share.js:125 js/share.js:617
+msgid "Error while sharing"
+msgstr "Gwall wrth rannu"
+
+#: js/share.js:136
+msgid "Error while unsharing"
+msgstr "Gwall wrth ddad-rannu"
+
+#: js/share.js:143
+msgid "Error while changing permissions"
+msgstr "Gwall wrth newid caniatâd"
+
+#: js/share.js:152
+msgid "Shared with you and the group {group} by {owner}"
+msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
+
+#: js/share.js:154
+msgid "Shared with you by {owner}"
+msgstr "Rhannwyd â chi gan {owner}"
+
+#: js/share.js:159
+msgid "Share with"
+msgstr "Rhannu gyda"
+
+#: js/share.js:164
+msgid "Share with link"
+msgstr "Dolen ar gyfer rhannu"
+
+#: js/share.js:167
+msgid "Password protect"
+msgstr "Diogelu cyfrinair"
+
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+msgid "Password"
+msgstr "Cyfrinair"
+
+#: js/share.js:173
+msgid "Email link to person"
+msgstr "E-bostio dolen at berson"
+
+#: js/share.js:174
+msgid "Send"
+msgstr "Anfon"
+
+#: js/share.js:178
+msgid "Set expiration date"
+msgstr "Gosod dyddiad dod i ben"
+
+#: js/share.js:179
+msgid "Expiration date"
+msgstr "Dyddiad dod i ben"
+
+#: js/share.js:211
+msgid "Share via email:"
+msgstr "Rhannu drwy e-bost:"
+
+#: js/share.js:213
+msgid "No people found"
+msgstr "Heb ganfod pobl"
+
+#: js/share.js:251
+msgid "Resharing is not allowed"
+msgstr "Does dim hawl ail-rannu"
+
+#: js/share.js:287
+msgid "Shared in {item} with {user}"
+msgstr "Rhannwyd yn {item} â {user}"
+
+#: js/share.js:308
+msgid "Unshare"
+msgstr "Dad-rannu"
+
+#: js/share.js:320
+msgid "can edit"
+msgstr "yn gallu golygu"
+
+#: js/share.js:322
+msgid "access control"
+msgstr "rheolaeth mynediad"
+
+#: js/share.js:325
+msgid "create"
+msgstr "creu"
+
+#: js/share.js:328
+msgid "update"
+msgstr "diweddaru"
+
+#: js/share.js:331
+msgid "delete"
+msgstr "dileu"
+
+#: js/share.js:334
+msgid "share"
+msgstr "rhannu"
+
+#: js/share.js:368 js/share.js:564
+msgid "Password protected"
+msgstr "Diogelwyd â chyfrinair"
+
+#: js/share.js:577
+msgid "Error unsetting expiration date"
+msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
+
+#: js/share.js:589
+msgid "Error setting expiration date"
+msgstr "Gwall wrth osod dyddiad dod i ben"
+
+#: js/share.js:604
+msgid "Sending ..."
+msgstr "Yn anfon ..."
+
+#: js/share.js:615
+msgid "Email sent"
+msgstr "Anfonwyd yr e-bost"
+
+#: 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 "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>."
+
+#: js/update.js:18
+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
+msgid "ownCloud password reset"
+msgstr "ailosod cyfrinair ownCloud"
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}"
+
+#: 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 "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol."
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost."
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
+msgid "Username"
+msgstr "Enw defnyddiwr"
+
+#: lostpassword/templates/lostpassword.php:21
+msgid "Request reset"
+msgstr "Gwneud cais i ailosod"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "Ailosodwyd eich cyfrinair"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "I'r dudalen mewngofnodi"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "Cyfrinair newydd"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "Ailosod cyfrinair"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "Personol"
+
+#: strings.php:6
+msgid "Users"
+msgstr "Defnyddwyr"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "Pecynnau"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "Gweinyddu"
+
+#: strings.php:9
+msgid "Help"
+msgstr "Cymorth"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr "Mynediad wedi'i wahardd"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "Methwyd canfod cwmwl"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr "Golygu categorïau"
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr "Rhybudd Diogelwch"
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)"
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr "Diweddarwch eich PHP i ddefnyddio ownCloud yn ddiogel."
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr "Does dim cynhyrchydd rhifau hap diogel ar gael, galluogwch estyniad PHP OpenSSL."
+
+#: 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 "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif."
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. "
+
+#: 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 "Am wybodaeth ar sut i gyflunio'r gweinydd yn gywir, cyfeiriwch at y <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">ddogfennaeth</a>."
+
+#: templates/installation.php:44
+msgid "Create an <strong>admin account</strong>"
+msgstr "Crewch <strong>gyfrif gweinyddol</strong>"
+
+#: templates/installation.php:62
+msgid "Advanced"
+msgstr "Uwch"
+
+#: templates/installation.php:64
+msgid "Data folder"
+msgstr "Plygell data"
+
+#: templates/installation.php:74
+msgid "Configure the database"
+msgstr "Cyflunio'r gronfa ddata"
+
+#: 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 "ddefnyddir"
+
+#: templates/installation.php:137
+msgid "Database user"
+msgstr "Defnyddiwr cronfa ddata"
+
+#: templates/installation.php:144
+msgid "Database password"
+msgstr "Cyfrinair cronfa ddata"
+
+#: templates/installation.php:149
+msgid "Database name"
+msgstr "Enw cronfa ddata"
+
+#: templates/installation.php:159
+msgid "Database tablespace"
+msgstr "Tablespace cronfa ddata"
+
+#: templates/installation.php:166
+msgid "Database host"
+msgstr "Gwesteiwr cronfa ddata"
+
+#: templates/installation.php:172
+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
+#, 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
+msgid "Log out"
+msgstr "Allgofnodi"
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr "Gwrthodwyd mewngofnodi awtomatig!"
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr "Os na wnaethoch chi newid eich cyfrinair yn ddiweddar, gall eich cyfrif fod yn anniogel!"
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr "Newidiwch eich cyfrinair i ddiogleu eich cyfrif eto."
+
+#: templates/login.php:34
+msgid "Lost your password?"
+msgstr "Wedi colli'ch cyfrinair?"
+
+#: templates/login.php:39
+msgid "remember"
+msgstr "cofio"
+
+#: templates/login.php:41
+msgid "Log in"
+msgstr "Mewngofnodi"
+
+#: templates/login.php:47
+msgid "Alternative Logins"
+msgstr "Mewngofnodiadau Amgen"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "blaenorol"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "nesaf"
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..a04bf66d91c863f14644d43bc65148be4f59c0a2
--- /dev/null
+++ b/l10n/cy_GB/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli"
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr "Methwyd symud %s"
+
+#: ajax/upload.php:19
+msgid "No file was uploaded. Unknown error"
+msgstr "Ni lwythwyd ffeil i fyny. Gwall anhysbys."
+
+#: ajax/upload.php:26
+msgid "There is no error, the file uploaded with success"
+msgstr "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus"
+
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:"
+
+#: ajax/upload.php:29
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML"
+
+#: ajax/upload.php:30
+msgid "The uploaded file was only partially uploaded"
+msgstr "Dim ond yn rhannol y llwythwyd y ffeil i fyny"
+
+#: ajax/upload.php:31
+msgid "No file was uploaded"
+msgstr "Ni lwythwyd ffeil i fyny"
+
+#: ajax/upload.php:32
+msgid "Missing a temporary folder"
+msgstr "Plygell dros dro yn eisiau"
+
+#: ajax/upload.php:33
+msgid "Failed to write to disk"
+msgstr "Methwyd ysgrifennu i'r ddisg"
+
+#: ajax/upload.php:51
+msgid "Not enough storage available"
+msgstr "Dim digon o le storio ar gael"
+
+#: ajax/upload.php:83
+msgid "Invalid directory."
+msgstr "Cyfeiriadur annilys."
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr "Ffeiliau"
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Rhannu"
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr "Dileu'n barhaol"
+
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+msgid "Delete"
+msgstr "Dileu"
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr "Ailenwi"
+
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+msgid "Pending"
+msgstr "I ddod"
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "{new_name} already exists"
+msgstr "{new_name} yn bodoli'n barod"
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "replace"
+msgstr "amnewid"
+
+#: js/filelist.js:259
+msgid "suggest name"
+msgstr "awgrymu enw"
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "cancel"
+msgstr "diddymu"
+
+#: js/filelist.js:306
+msgid "replaced {new_name} with {old_name}"
+msgstr "newidiwyd {new_name} yn lle {old_name}"
+
+#: js/filelist.js:306
+msgid "undo"
+msgstr "dadwneud"
+
+#: js/filelist.js:331
+msgid "perform delete operation"
+msgstr "cyflawni gweithred dileu"
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr "1 ffeil yn llwytho i fyny"
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr "ffeiliau'n llwytho i fyny"
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr "Mae '.' yn enw ffeil annilys."
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr "Does dim hawl cael enw ffeil gwag."
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
+
+#: js/files.js:231
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
+
+#: js/files.js:264
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "Methu llwytho'ch ffeil i fyny gan ei fod yn gyferiadur neu'n cynnwys 0 beit"
+
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr "Dim digon o le ar gael"
+
+#: js/files.js:317
+msgid "Upload cancelled."
+msgstr "Diddymwyd llwytho i fyny."
+
+#: js/files.js:413
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
+
+#: js/files.js:486
+msgid "URL cannot be empty."
+msgstr "Does dim hawl cael URL gwag."
+
+#: js/files.js:491
+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
+msgid "Error"
+msgstr "Gwall"
+
+#: js/files.js:877 templates/index.php:69
+msgid "Name"
+msgstr "Enw"
+
+#: js/files.js:878 templates/index.php:80
+msgid "Size"
+msgstr "Maint"
+
+#: js/files.js:879 templates/index.php:82
+msgid "Modified"
+msgstr "Addaswyd"
+
+#: js/files.js:898
+msgid "1 folder"
+msgstr "1 blygell"
+
+#: js/files.js:900
+msgid "{count} folders"
+msgstr "{count} plygell"
+
+#: js/files.js:908
+msgid "1 file"
+msgstr "1 ffeil"
+
+#: js/files.js:910
+msgid "{count} files"
+msgstr "{count} ffeil"
+
+#: 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 "Methu ailenwi ffeil"
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Llwytho i fyny"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr "Trafod ffeiliau"
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "Maint mwyaf llwytho i fyny"
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr "mwyaf. posib:"
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr "Angen ar gyfer llwytho mwy nag un ffeil neu blygell i lawr yr un pryd."
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr "Galluogi llwytho i lawr ZIP"
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr "0 yn ddiderfyn"
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr "Cadw"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "Newydd"
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr "Ffeil destun"
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr "Plygell"
+
+#: templates/index.php:14
+msgid "From link"
+msgstr "Dolen o"
+
+#: templates/index.php:42
+msgid "Deleted files"
+msgstr "Ffeiliau ddilewyd"
+
+#: templates/index.php:48
+msgid "Cancel upload"
+msgstr "Diddymu llwytho i fyny"
+
+#: templates/index.php:54
+msgid "You don’t have write permissions here."
+msgstr "Nid oes gennych hawliau ysgrifennu fan hyn."
+
+#: templates/index.php:61
+msgid "Nothing in here. Upload something!"
+msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
+
+#: templates/index.php:75
+msgid "Download"
+msgstr "Llwytho i lawr"
+
+#: templates/index.php:87 templates/index.php:88
+msgid "Unshare"
+msgstr "Dad-rannu"
+
+#: templates/index.php:107
+msgid "Upload too large"
+msgstr "Maint llwytho i fyny'n rhy fawr"
+
+#: templates/index.php:109
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn."
+
+#: templates/index.php:114
+msgid "Files are being scanned, please wait."
+msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
+
+#: templates/index.php:117
+msgid "Current scanning"
+msgstr "Sganio cyfredol"
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr "Uwchraddio storfa system ffeiliau..."
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..7cd6f45cb5fa090c9dbd80692c2598d435ff91fa
--- /dev/null
+++ b/l10n/cy_GB/files_encryption.po
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# ubuntucymraeg <owen.llywelyn@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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Yn cadw..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr "Amgryptiad"
+
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..78d44d150464823517112c5f9774a38f512de07c
--- /dev/null
+++ b/l10n/cy_GB/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\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 "Grwpiau"
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr "Defnyddwyr"
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr "Dileu"
+
+#: 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/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..16f9054a7bf42f52950962c31ad6d4f080aaf1c0
--- /dev/null
+++ b/l10n/cy_GB/files_sharing.po
@@ -0,0 +1,48 @@
+# 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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr "Cyfrinair"
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr "Cyflwyno"
+
+#: templates/public.php:10
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr "Rhannodd %s blygell %s â chi"
+
+#: templates/public.php:13
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr "Rhannodd %s ffeil %s â chi"
+
+#: templates/public.php:19 templates/public.php:43
+msgid "Download"
+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
new file mode 100644
index 0000000000000000000000000000000000000000..b1fbd8c2afe3c8690606789b2083a9ccfca700be
--- /dev/null
+++ b/l10n/cy_GB/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr "Methwyd dileu %s yn barhaol"
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr "Methwyd adfer %s"
+
+#: js/trash.js:7 js/trash.js:97
+msgid "perform restore operation"
+msgstr "gweithrediad adfer"
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+msgid "Error"
+msgstr "Gwall"
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr "dileu ffeil yn barhaol"
+
+#: js/trash.js:123
+msgid "Delete permanently"
+msgstr "Dileu'n barhaol"
+
+#: js/trash.js:176 templates/index.php:17
+msgid "Name"
+msgstr "Enw"
+
+#: js/trash.js:177 templates/index.php:27
+msgid "Deleted"
+msgstr "Wedi dileu"
+
+#: js/trash.js:186
+msgid "1 folder"
+msgstr "1 blygell"
+
+#: js/trash.js:188
+msgid "{count} folders"
+msgstr "{count} plygell"
+
+#: js/trash.js:196
+msgid "1 file"
+msgstr "1 ffeil"
+
+#: js/trash.js:198
+msgid "{count} files"
+msgstr "{count} ffeil"
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "Does dim byd yma. Mae eich bin sbwriel yn wag!"
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr "Adfer"
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr "Dileu"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr "Ffeiliau Ddilewyd"
diff --git a/l10n/cy_GB/files_versions.po b/l10n/cy_GB/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..ee2268ca74e97c311ce3894553a36d19d246d95a
--- /dev/null
+++ b/l10n/cy_GB/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-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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\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/cy_GB/lib.po b/l10n/cy_GB/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..281950fd66d3781f077e767f106716b7c07a2da5
--- /dev/null
+++ b/l10n/cy_GB/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-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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
+msgid "Help"
+msgstr "Cymorth"
+
+#: app.php:370
+msgid "Personal"
+msgstr "Personol"
+
+#: app.php:381
+msgid "Settings"
+msgstr "Gosodiadau"
+
+#: app.php:393
+msgid "Users"
+msgstr "Defnyddwyr"
+
+#: app.php:406
+msgid "Apps"
+msgstr "Pecynnau"
+
+#: app.php:414
+msgid "Admin"
+msgstr "Gweinyddu"
+
+#: files.php:210
+msgid "ZIP download is turned off."
+msgstr "Mae llwytho ZIP wedi ei ddiffodd."
+
+#: files.php:211
+msgid "Files need to be downloaded one by one."
+msgstr "Mae angen llwytho ffeiliau i lawr fesul un."
+
+#: files.php:212 files.php:245
+msgid "Back to Files"
+msgstr "Nôl i Ffeiliau"
+
+#: files.php:242
+msgid "Selected files too large to generate zip file."
+msgstr "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip."
+
+#: helper.php:236
+msgid "couldn't be determined"
+msgstr "methwyd pennu"
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr "Nid yw'r pecyn wedi'i alluogi"
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr "Gwall dilysu"
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr "Tocyn wedi dod i ben. Ail-lwythwch y dudalen."
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr "Ffeiliau"
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr "Testun"
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr "Delweddau"
+
+#: setup.php:34
+msgid "Set an admin username."
+msgstr "Creu enw defnyddiwr i'r gweinyddwr."
+
+#: setup.php:37
+msgid "Set an admin password."
+msgstr "Gosod cyfrinair y gweinyddwr."
+
+#: setup.php:55
+#, php-format
+msgid "%s enter the database username."
+msgstr "%s rhowch enw defnyddiwr y gronfa ddata."
+
+#: setup.php:58
+#, php-format
+msgid "%s enter the database name."
+msgstr "%s rhowch enw'r gronfa ddata."
+
+#: setup.php:61
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr "%s does dim hawl defnyddio dot yn enw'r gronfa ddata"
+
+#: setup.php:64
+#, php-format
+msgid "%s set the database host."
+msgstr "%s gosod gwesteiwr y gronfa ddata."
+
+#: setup.php:132 setup.php:329 setup.php:374
+msgid "PostgreSQL username and/or password not valid"
+msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
+
+#: setup.php:133 setup.php:238
+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
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:237
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
+
+#: setup.php:309
+msgid "Drop this user from MySQL"
+msgstr "Gollwng y defnyddiwr hwn o MySQL"
+
+#: setup.php:314
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
+
+#: setup.php:315
+msgid "Drop this user from MySQL."
+msgstr "Gollwng y defnyddiwr hwn o MySQL."
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Enw a/neu gyfrinair Oracle annilys"
+
+#: setup.php:592 setup.php:624
+#, 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
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
+
+#: setup.php:867
+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
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
+
+#: template.php:113
+msgid "seconds ago"
+msgstr "eiliad yn ôl"
+
+#: template.php:114
+msgid "1 minute ago"
+msgstr "1 munud yn ôl"
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr "%d munud yn ôl"
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr "1 awr yn ôl"
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr "%d awr yn ôl"
+
+#: template.php:118
+msgid "today"
+msgstr "heddiw"
+
+#: template.php:119
+msgid "yesterday"
+msgstr "ddoe"
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr "%d diwrnod yn ôl"
+
+#: template.php:121
+msgid "last month"
+msgstr "mis diwethaf"
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr "%d mis yn ôl"
+
+#: template.php:123
+msgid "last year"
+msgstr "y llynedd"
+
+#: template.php:124
+msgid "years ago"
+msgstr "blwyddyn yn ôl"
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "Methu canfod categori \"%s\""
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..785015e3e9e4443be164072a331d8cf32f7d84b0
--- /dev/null
+++ b/l10n/cy_GB/settings.po
@@ -0,0 +1,496 @@
+# 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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\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 "Gwall dilysu"
+
+#: 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:24
+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 "Cais annilys"
+
+#: 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 "Gwall"
+
+#: 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 "Yn cadw..."
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr "dadwneud"
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
+msgid "Groups"
+msgstr "Grwpiau"
+
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:160
+msgid "Delete"
+msgstr "Dileu"
+
+#: 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 "Rhybudd Diogelwch"
+
+#: 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 "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
+
+#: 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:111
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:237 templates/personal.php:114
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"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:11
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:12
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:34
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:36
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:38
+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:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+msgid "Password"
+msgstr "Cyfrinair"
+
+#: templates/personal.php:38
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "New password"
+msgstr "Cyfrinair newydd"
+
+#: templates/personal.php:44
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:71
+msgid "Email"
+msgstr "E-bost"
+
+#: templates/personal.php:73
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:74
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:83 templates/personal.php:84
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:95
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:100
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:102
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:80
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:44 templates/users.php:138
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:62 templates/users.php:153
+msgid "Other"
+msgstr "Arall"
+
+#: templates/users.php:87
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:98
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:102
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:133
+msgid "Default"
+msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..99ba7c568e3e23f610337a11620a3cff32bf9ab0
--- /dev/null
+++ b/l10n/cy_GB/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\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 "Methwyd dileu"
+
+#: 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 "Gwall"
+
+#: 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 "Cyfrinair"
+
+#: 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 "Cymorth"
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..2f567efac8ec3b063b347c56e0cc657110c47dc7
--- /dev/null
+++ b/l10n/cy_GB/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-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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cy_GB\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+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/da/core.po b/l10n/da/core.po
index daab9063b3d901e2a6fea7fe109f3ef9fb1f984a..e5a78600fcdb6a898c639dddc4b4c38f5cfad5fc 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bawl <transifex@bawl.dk>, 2013.
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-#   <mikkelbjerglarsen@gmail.com>, 2011, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
-# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
-# Rasmus Paasch <rasmuspaasch@gmail.com>, 2013.
-#   <simon@rosmi.dk>, 2012.
-# Thomas Tanghus <>, 2012.
-# Thomas Tanghus <thomas@tanghus.net>, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Bawl <transifex@bawl.dk>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 06:10+0000\n"
+"Last-Translator: Peter Jespersen <flywheeldk@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"
@@ -171,75 +161,79 @@ msgstr "December"
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Vælg"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Fortryd"
+msgstr "Annuller"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nej"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nej"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -304,7 +298,7 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kodeord"
 
@@ -407,24 +401,27 @@ msgstr "Nulstil ownCloud kodeord"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Anvend følgende link til at nulstille din adgangskode: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
+#: 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 "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:5
-msgid "Reset email send."
-msgstr "Reset-mail afsendt."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Anmodningen mislykkedes!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Brugernavn"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Anmod om nulstilling"
 
@@ -446,7 +443,7 @@ msgstr "Nulstil kodeord"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
 #: strings.php:6
 msgid "Users"
@@ -530,37 +527,37 @@ msgstr "Avanceret"
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "vil blive brugt"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
@@ -568,37 +565,42 @@ msgstr "Afslut opsætning"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Log ud"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk login afvist!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Skift adgangskode for at sikre din konto igen."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Log ind"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 4e78dc104bcb31e807347073f2295a316a96d023..80a65611032b682437b0c68c64ab54ffca617ee4 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,22 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
-#   <osos@openeyes.dk>, 2012.
-# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
-#   <simon@rosmi.dk>, 2012.
-# Thomas <cronner@gmail.com>, 2013.
-# Thomas Tanghus <>, 2012.
-# Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -37,17 +27,13 @@ msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kunne ikke omdøbe fil"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Der er ingen fejl, filen blev uploadet med success"
+msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
 #: ajax/upload.php:27
 msgid ""
@@ -58,19 +44,19 @@ msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
+msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Den uploadede file blev kun delvist uploadet"
+msgstr "Filen blev kun delvist uploadet."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Ingen fil blev uploadet"
+msgstr "Ingen fil uploadet"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Mangler en midlertidig mappe"
+msgstr "Manglende midlertidig mappe."
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -88,57 +74,61 @@ msgstr "Ugyldig mappe."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Del"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Slet"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "udfør slet operation"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "uploader filer"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -162,69 +152,77 @@ msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
+msgstr "Kan ikke uploade din fil - det er enten en mappe eller en fil med et indhold på 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "ikke nok tilgængelig ledig plads "
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke være tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fejl"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: 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 "Kunne ikke omdøbe fil"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Upload"
@@ -285,37 +283,37 @@ msgstr "Slettede filer"
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Du har ikke skriverettigheder her."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Upload for stor"
+msgstr "Upload er for stor"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Indlæser"
 
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 416d8486d5ca123c5477df62a6004c40e50f085b..49b772ef5d44c43b58f78a129e297e0ce59aba81 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
-#   <osos@openeyes.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:46+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +17,87 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gemmer..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil kryptering aktiveret."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "De følgende filtyper vil ikke blive krypteret:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder de følgende fil typer fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index cc8e5b1025720f0ddc40a84ef65ab012aa9ac2c3..4ca39b66c4fae08cd5961c8e418d39c43240a16b 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bawl <transifex@bawl.dk>, 2013.
-#   <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-31 00:01+0100\n"
-"PO-Revision-Date: 2013-03-30 18:00+0000\n"
-"Last-Translator: Bawl <transifex@bawl.dk>\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"
 "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"
@@ -41,19 +37,26 @@ msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
 msgid "Error configuring Google Drive storage"
 msgstr "Fejl ved konfiguration af Google Drive plads"
 
-#: lib/config.php:423
+#: 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 "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det."
 
-#: lib/config.php:426
+#: 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 "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det."
 
+#: 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 "<b>Advarsel:</b> Understøttelsen for Curl i PHP er enten ikke aktiveret eller ikke installeret. Det er ikke muligt, at montere ownCloud / WebDAV eller GoogleDrive. Spørg din system administrator om at installere det. "
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Ekstern opbevaring"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 99b2cdf8e9cf2670d5bcb11647979c8432ea6e8c..124f03c1e50b3f249ea7610c274ff4d460e4fa30 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-#   <osos@openeyes.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 08:48+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "Kodeord"
 msgid "Submit"
 msgstr "Send"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med dig"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med dig"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgængelig for"
 
-#: templates/public.php:37
+#: 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 5c96449c4becc933b036de163c449e89b715dd5e..2fbadf71c60be9f42de14d6900e8372b0d8f7421 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bawl <transifex@bawl.dk>, 2013.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Kunne ikke slette %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "udfør gendannelsesoperation"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fejl"
 
@@ -41,31 +39,31 @@ msgstr "Fejl"
 msgid "delete file permanently"
 msgstr "slet fil permanent"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 6b6ab2ac91f3c355a8d2171d5c7b81289c13c6f6..23356455f8ad4de249771b40eb869e1b579320de 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-#   <osos@openeyes.dk>, 2012.
-# Thomas <cronner@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-04 18:20+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\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"
 "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"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index ef2223373c7a55b94442d5cd33cbebce36538e8f..c21fdcab0043daa635e1e034323486e96d2abb61 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012-2013.
-#   <osos@openeyes.dk>, 2012.
-# Thomas <cronner@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:33+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,47 +17,47 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hjælp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Brugere"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slået fra."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Filer skal downloades en for en."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Tilbage til Filer"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "kunne ikke fastslås"
 
@@ -98,10 +93,6 @@ msgstr "Angiv et admin brugernavn."
 msgid "Set an admin password."
 msgstr "Angiv et admin kodeord."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Specificer en data mappe."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -122,72 +113,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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Databasefejl: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fejlende kommando var: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
@@ -216,11 +211,11 @@ msgstr "%d timer siden"
 
 #: template.php:118
 msgid "today"
-msgstr "I dag"
+msgstr "i dag"
 
 #: template.php:119
 msgid "yesterday"
-msgstr "I går"
+msgstr "i går"
 
 #: template.php:120
 #, php-format
@@ -229,7 +224,7 @@ msgstr "%d dage siden"
 
 #: template.php:121
 msgid "last month"
-msgstr "Sidste måned"
+msgstr "sidste måned"
 
 #: template.php:122
 #, php-format
@@ -238,25 +233,12 @@ msgstr "%d måneder siden"
 
 #: template.php:123
 msgid "last year"
-msgstr "Sidste år"
+msgstr "sidste år"
 
 #: template.php:124
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s er tilgængelig. Få <a href=\"%s\">mere information</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "opdateret"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Check for opdateringer er deaktiveret"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 282d822bdedd2788f12d8ff2df50d04f0d618638..7dcf4dca63eb0c83bd33e52b0bf971cd579f3f72 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,24 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2013.
-#   <icewind1991@gmail.com>, 2012.
-#   <mikkelbjerglarsen@gmail.com>, 2011.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
-# Ole Holm Frandsen <froksen@gmail.com>, 2012.
-# Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
-#   <simon@rosmi.dk>, 2012.
-#   <sr@ybnet.dk>, 2012-2013.
-# Thomas <cronner@gmail.com>, 2013.
-# Thomas Tanghus <>, 2012.
-# Thomas Tanghus <thomas@tanghus.net>, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -33,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Adgangsfejl"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Dit skærmnavn blev ændret."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Kunne ikke skifte skærmnavn"
 
@@ -128,52 +121,52 @@ msgstr "Der opstod en fejl under app opgraderingen"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "Slettet"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "fortryd"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Slet"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "Tilføj gruppe"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Et gyldigt brugernavn skal angives"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Fejl ved oprettelse af bruger"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "En gyldig adgangskode skal angives"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -324,19 +317,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -405,9 +398,9 @@ msgstr "Hent applikationerne for at synkronisere dine filer"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr "Vis Første Kørsel Guiden igen"
+msgstr "Vis Første Kørsels Guiden igen."
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Kodeord"
 
@@ -425,88 +418,80 @@ msgstr "Nuværende adgangskode"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "Ny adgangskode"
+msgstr "Nyt kodeord"
 
 #: templates/personal.php:44
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Skærmnavn"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Dit skærmnavn blev ændret"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Kunne ikke skifte dit skærmnavn"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Skift skærmnavn"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Loginnavn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Standard opbevaring"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Opbevaring"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "skift skærmnavn"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "skift kodeord"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 6ac95f9ce5c201e73c25db227b1925e107db0c01..f2c20cdc87e5253008f231c6e0dc3588c0a76179 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blah@blacksunset.dk>, 2012.
-#   <cronner@gmail.com>, 2012.
-# Frederik Lassen <frederiklassen@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
-#   <sr@ybnet.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +17,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -58,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fejl"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Bruger DN"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Bruger Login Filter"
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brugerliste Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definere filteret der bruges ved indlæsning af brugere."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppe Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definere filteret der bruges når der indlæses grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Brug TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Deaktiver SSL certifikat validering"
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Anbefales ikke, brug kun for at teste."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "User Display Name Field"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base Bruger Træ"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 32a2a3729ab90af29dd57d91636c64ec99146674..9c0bc594ab88a033d8fb326eabded596bb9b7167 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013.
+# cronner <cronner@gmail.com>, 2012
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-30 00:23+0100\n"
-"PO-Revision-Date: 2013-01-29 12:07+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "WebDAV-godkendelse"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d9832487b0b87beb036d9fd0cc07b7b786c25343..2912dbd44eb054a027ab0894f29e12e2006cd9ad 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -3,30 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011-2012.
-#   <alex.hotz@gmail.com>, 2011.
-#   <blobbyjj@ymail.com>, 2012.
-#   <georg.stefan.germany@googlemail.com>, 2011.
-# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-#   <markus.thiel@desico.de>, 2012.
-#   <m.fresel@sysangels.com>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-# Susi  <>, 2012.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
+# arkascha <foss@christian-reiner.info>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
+"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -177,75 +163,79 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nein"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nein"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -284,7 +274,7 @@ msgstr "Fehler beim Teilen"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Fehler beim Aufheben der Teilung"
+msgstr "Fehler beim Aufheben der Freigabe"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
@@ -310,7 +300,7 @@ msgstr "Ãœber einen Link freigegeben"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
@@ -380,7 +370,7 @@ msgstr "Durch ein Passwort geschützt"
 
 #: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "Fehler beim entfernen des Ablaufdatums"
+msgstr "Fehler beim Entfernen des Ablaufdatums"
 
 #: js/share.js:589
 msgid "Error setting expiration date"
@@ -399,11 +389,11 @@ 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 "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
+msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -413,24 +403,27 @@ msgstr "ownCloud-Passwort zurücksetzen"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
+#: 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 "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Die Anfrage schlug fehl!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Benutzername"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Beantrage Zurücksetzung"
 
@@ -460,11 +453,11 @@ msgstr "Benutzer"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Anwendungen"
+msgstr "Apps"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administration"
 
 #: strings.php:9
 msgid "Help"
@@ -497,7 +490,7 @@ msgstr "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angrei
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Bitte bringe deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können."
+msgstr "Bitte bringe Deine PHP Installation auf den neuesten Stand, um ownCloud sicher nutzen zu können."
 
 #: templates/installation.php:32
 msgid ""
@@ -515,14 +508,14 @@ msgstr "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage di
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Dein Datenverzeichnis und deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
+msgstr "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert."
 
 #: 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 "Bitte lesen Sie die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Sie Ihren Server konfigurieren."
+msgstr "Bitte ließ die <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Dokumentation</a> für Informationen, wie Du Deinen Server konfigurierst."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -536,75 +529,80 @@ msgstr "Fortgeschritten"
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "wird verwendet"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Web-Services unter Ihrer Kontrolle"
+msgstr "Web-Services unter Deiner Kontrolle"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatischer Login zurückgewiesen!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Wenn Du Dein Passwort nicht vor kurzem geändert hast, könnte Dein\nAccount kompromittiert sein!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 56d2bffd5a7dc2a52ed147e143146ba3641d06ad..8aa114e960f447842cc8f4a4cc3a8ba7d6615883 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,35 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2012.
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
-#   <lukas@statuscode.ch>, 2012.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-#   <markus.thiel@desico.de>, 2013.
-# Michael Krell <m4dmike.mni@gmail.com>, 2012.
-#   <nelsonfritsch@gmail.com>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-#   <thomas.mueller@tmit.eu>, 2012.
-# Thomas Müller <>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-#   <transifex.com@mail.simonzoellner.de>, 2013.
-#  <uu.kabum@gmail.com>, 2013.
-#   <uu.kabum@gmail.com>, 2013.
-#  <wachhund@wachhund.to>, 2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 06:50+0000\n"
-"Last-Translator: kabum <uu.kabum@gmail.com>\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,16 +21,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "%s konnte nicht verschoben werden - eine Datei mit diesem Namen existiert bereits."
+msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "%s konnte nicht verschoben werden"
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Die Datei konnte nicht umbenannt werden"
+msgstr "Konnte %s nicht verschieben"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -59,7 +34,7 @@ msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Datei fehlerfrei hochgeladen."
+msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
 #: ajax/upload.php:27
 msgid ""
@@ -70,19 +45,19 @@ msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
+msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Die Datei wurde nur teilweise hochgeladen."
+msgstr "Die Datei konnte nur teilweise übertragen werden"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Es wurde keine Datei hochgeladen."
+msgstr "Keine Datei konnte übertragen werden."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Temporärer Ordner fehlt."
+msgstr "Kein temporärer Ordner vorhanden"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -90,7 +65,7 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr "Nicht genug Speicherplatz verfügbar"
+msgstr "Nicht genug Speicher vorhanden."
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -100,55 +75,59 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Teilen"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "Permanent löschen"
+msgstr "Endgültig löschen"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Name vorschlagen"
+msgstr "Namen vorschlagen"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "Eine Datei wird hoch geladen"
+msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -168,75 +147,83 @@ msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ihr Speicherplatz ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!"
+msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)"
+msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
+msgstr "Deine Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nicht genug Speicherplatz verfügbar"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Bearbeitet"
+msgstr "Geändert"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} Dateien"
 
+#: 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 "Konnte Datei nicht umbenennen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Hochladen"
@@ -297,37 +284,37 @@ msgstr "Gelöschte Dateien"
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr "Du besitzt hier keine Schreib-Berechtigung."
+msgstr "Du hast hier keine Schreib-Berechtigung."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Nicht mehr freigeben"
+msgstr "Freigabe aufheben"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Upload zu groß"
+msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scanne"
 
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 3cfd6711a27e2bee724937260e9138e094dcfb28..59cfb0e8e2cc0f0636ae728e32b6b42b74efcb18 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <driz@i2pmail.org>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-18 00:05+0100\n"
-"PO-Revision-Date: 2013-02-17 14:12+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Dateiverschlüsselung ist aktiviert"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Schließe die folgenden Dateitypen von der Verschlüsselung aus:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Keine"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 526b65c881ac067c1e751f6061a0ef9e030ab47e..7afea52f30a13bc6f7c1c25088276baa4608efe7 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
+# arkascha <foss@christian-reiner.info>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,19 +38,26 @@ msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren."
 
-#: lib/config.php:426
+#: 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 "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator."
 
+#: 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 "<b>Warnung:</b> Die Curl-Unterstützung in PHP ist nicht aktiviert oder installiert. Das Einbinden von ownCloud / WebDav der GoogleDrive-Freigaben ist nicht möglich. Bitte Deinen Systemadminstrator um die Installation. "
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externer Speicher"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index b48b1dfa72bdad923f1bd0fb0b6a18e0ff337550..e3c784db44c9a2120cc33df06ca2c464e2d1e8ba 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:36+0000\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"
-"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
+"Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,24 +25,24 @@ msgstr "Passwort"
 msgid "Submit"
 msgstr "Absenden"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Dir geteilt"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Dir geteilt"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Download"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
 
-#: templates/public.php:35
+#: 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 4685f7fcd0130581ba7cdb85a0c22c0af9cfb7f3..a2431575c2973b2580bf0cbf327959e3266c9681 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/files_trashbin.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# I Robot <owncloud-bot@tmit.eu>, 2013.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# Tristan <blobbyjj@ymail.com>, 2013.
-#  <wachhund@wachhund.to>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,11 +27,11 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausführen"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fehler"
 
@@ -43,31 +39,31 @@ msgstr "Fehler"
 msgid "delete file permanently"
 msgstr "Datei dauerhaft löschen"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "gelöscht"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index c62bef6afd5323a29e3c98f5045e6bdfcf175b4a..24dc7347362b9ee228964ebb7443888b2eeed196 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -3,19 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-#   <niko@nik-o-mat.de>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-23 00:02+0100\n"
-"PO-Revision-Date: 2013-03-22 09:34+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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 28b2f9aa3250f590aefd526aaaaca8cb8194d4f1..01d81cfe91fcc4e6591207b2b5c0dd2171c737bd 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,22 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-# Phi Lieb <>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,47 +18,47 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
-msgstr "Administrator"
+msgstr "Administration"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "konnte nicht festgestellt werden"
 
@@ -77,7 +68,7 @@ msgstr "Die Anwendung ist nicht aktiviert"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Authentifizierungs-Fehler"
+msgstr "Fehler bei der Anmeldung"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -103,10 +94,6 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Datei-Verzeichnis angeben."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -127,75 +114,79 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle Benutzername und/oder Passwort ungültig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer von MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfe die <a href='%s'>Instalationsanleitungen</a>."
+msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -203,7 +194,7 @@ msgstr "Gerade eben"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "Vor einer Minute"
+msgstr "vor einer Minute"
 
 #: template.php:115
 #, php-format
@@ -249,19 +240,6 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "aktuell"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Die Update-Überprüfung ist ausgeschaltet"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index b7ba13672ade7e036040a7769dbd728ae5d47163..20d97d2d8462d2fced897dc1e371a0d11e3e8343 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -3,32 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011, 2012.
-#   <blobbyjj@ymail.com>, 2012.
-#   <icewind1991@gmail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# Jan T <jan-temesinko@web.de>, 2012.
-#   <lukas@statuscode.ch>, 2012.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-#   <markus.thiel@desico.de>, 2012.
-#   <mibunrui@gmx.de>, 2012.
-#   <nelsonfritsch@gmail.com>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
-#  <uu.kabum@gmail.com>, 2013.
-#  <wachhund@wachhund.to>, 2013.
+# arkascha <foss@christian-reiner.info>, 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,12 +23,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Fehler bei der Anmeldung"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Dein Anzeigename ist geändert worden."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
 
@@ -84,7 +70,7 @@ msgstr "Sprache geändert"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Ungültige Anfrage"
+msgstr "Fehlerhafte Anfrage"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -136,52 +122,52 @@ msgstr "Fehler beim Aktualisieren der App"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
@@ -211,7 +197,7 @@ msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil d
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
+msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -247,7 +233,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 "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest."
+msgstr "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen möchtest."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -279,31 +265,31 @@ msgstr "Aktiviere Sharing-API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr "Erlaube Apps die Nutzung der Share-API"
+msgstr "Erlaubt Apps die Nutzung der Share-API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr "Erlaube Links"
+msgstr "Erlaubt Links"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr "Erlaube Benutzern, Inhalte über öffentliche Links zu teilen"
+msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr "Erlaube erneutes Teilen"
+msgstr "Erlaubt erneutes Teilen"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr "Erlaube Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
+msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr "Erlaube Benutzern, mit jedem zu teilen"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr "Erlaube Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
+msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -322,7 +308,7 @@ msgstr "Erzwingt die Verwendung einer verschlüsselten Verbindung"
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern"
+msgstr "Bitte verbinde Dich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern"
 
 #: templates/admin.php:195
 msgid "Log"
@@ -332,19 +318,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -415,7 +401,7 @@ msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
 msgid "Show First Run Wizard again"
 msgstr "Erstinstallation erneut durchführen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Passwort"
 
@@ -439,82 +425,74 @@ msgstr "Neues Passwort"
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Dein Anzeigename wurde geändert"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Das Ändern deines Anzeigenamens ist nicht möglich"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Anzeigenamen ändern"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hilf bei der Ãœbersetzung"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "Anzeigenamen ändern"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 878c9aa1a8550334625169de60008d3f076fc357..9b62916ffc4b4c96d773fdd9b7c5a2d663c25f2d 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,23 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# Maurice Preuß <>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-# Susi  <>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,25 +18,29 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr "Die Konfiguration war erfolgreich, die Verbindung konnte hergestellt werden!"
+msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
+msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfe die Servereinstellungen und Anmeldeinformationen."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Die Konfiguration ist ungültig, bitte sehen Sie für weitere Details im ownCloud Log nach"
+msgstr "Die Konfiguration ist ungültig, sieh für weitere Details bitte im ownCloud Log nach"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -61,283 +56,365 @@ msgstr "Einstellungen beibehalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr "Serverkonfiguration konnte nicht hinzugefügt werden."
+msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolgreich"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Wollen Sie die aktuelle Serverkonfiguration wirklich löschen?"
+msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: templates/settings.php:8
+#: 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 "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
 
-#: templates/settings.php:11
+#: 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 "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverkonfiguration"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "Ein Base DN pro Zeile"
+msgstr "Ein Basis-DN pro Zeile"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:45
+#: 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 "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
+msgstr "Lasse die Felder DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:53
+#: 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 "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Konfiguration wird übersprungen wenn deaktiviert"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Backup Port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "Ein Benutzer Base DN pro Zeile"
+msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr "Optional; eine Eigenschaft pro Zeile"
+msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "Ein Gruppen Base DN pro Zeile"
+msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kontingent Feld"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Standard Kontingent"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-Mail Feld"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:99
+#: 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 "Testkonfiguration"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index d2653f16859cdda6d2cbb70cb80e18a285696976..ff18551f627ecdcba47acd28a550ce98116d75a9 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-#   <mibunrui@gmx.de>, 2013.
-#   <seeed@freenet.de>, 2012.
+# Mirodin <blobbyjj@ymail.com>, 2012
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# AndryXY <mibunrui@gmx.de>, 2013
+# seeed <seeed@freenet.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-21 00:14+0100\n"
-"PO-Revision-Date: 2013-02-20 22:10+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 1cda6c32609b6827ce86679cd56c63c1213f64fd..d1070a5d7b09726c21fd848afcb10aefa479b0bd 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -3,34 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011-2012.
-#   <alex.hotz@gmail.com>, 2011.
-#   <a.tangemann@web.de>, 2012.
-#   <blobbyjj@ymail.com>, 2012.
-#   <deh3nne@deviantdev.com>, 2012.
-#   <georg.stefan.germany@googlemail.com>, 2011.
-# I Robot <owncloud-bot@tmit.eu>, 2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-#   <m.fresel@sysangels.com>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <Steve_Reichert@gmx.de>, 2013.
-# Susi <>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#  <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
+# arkascha <foss@christian-reiner.info>, 2013
+# Marcel Kühlhorn <susefan93@gmx.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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -181,75 +164,79 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "Vor Jahren"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nein"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nein"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -288,7 +275,7 @@ msgstr "Fehler beim Teilen"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Fehler bei der Aufhebung der Teilung"
+msgstr "Fehler beim Aufheben der Freigabe"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
@@ -314,7 +301,7 @@ msgstr "Ãœber einen Link teilen"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwort"
 
@@ -417,26 +404,29 @@ msgstr "ownCloud-Passwort zurücksetzen"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
+#: 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 "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Eine E-Mail zum Zurücksetzen des Passworts wurde gesendet."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Die Anfrage schlug fehl!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Benutzername"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
-msgstr "Zurücksetzung beantragen"
+msgstr "Zurücksetzung anfordern"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -464,11 +454,11 @@ msgstr "Benutzer"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Anwendungen"
+msgstr "Apps"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrator"
 
 #: strings.php:9
 msgid "Help"
@@ -484,7 +474,7 @@ msgstr "Cloud wurde nicht gefunden"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Kategorien bearbeiten"
+msgstr "Kategorien ändern"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -540,37 +530,37 @@ msgstr "Fortgeschritten"
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "wird verwendet"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
@@ -578,37 +568,42 @@ msgstr "Installation abschließen"
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Abmelden"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "Automatische Anmeldung verweigert."
+msgstr "Automatische Anmeldung verweigert!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index c1af88b2acdb2d49ae652b22f36674ccd13f674a..2dd5d0dd85239f9e8aeadf7de064a8095f6e59f8 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -3,39 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2012.
-# Andreas Tangemann <a.tangemann@web.de>, 2013.
-#   <a.tangemann@web.de>, 2012-2013.
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
-#   <lukas@statuscode.ch>, 2012.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-#   <markus.thiel@desico.de>, 2013.
-# Michael Krell <m4dmike.mni@gmail.com>, 2012.
-#   <nelsonfritsch@gmail.com>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-# Phillip Schichtel <quick_wango@code-infection.de>, 2013.
-#  <robert.neumann01@gmail.com>, 2013.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <Steve_Reichert@gmx.de>, 2013.
-# Susi <>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-# Thomas Müller <>, 2012.
-#  <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
+# a.tangemann <a.tangemann@web.de>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 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-04-11 02:08+0200\n"
-"PO-Revision-Date: 2013-04-10 21:50+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -54,40 +30,36 @@ msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert berei
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Konnte Datei nicht umbenennen"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
+msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in der php.ini:"
+msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
+msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Die Datei wurde nur teilweise hochgeladen."
+msgstr "Die Datei konnte nur teilweise übertragen werden"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Es wurde keine Datei hochgeladen."
+msgstr "Keine Datei konnte übertragen werden."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Der temporäre Ordner fehlt."
+msgstr "Kein temporärer Ordner vorhanden"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -105,55 +77,59 @@ msgstr "Ungültiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Teilen"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "Entgültig löschen"
+msgstr "Endgültig löschen"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "Einen Namen vorschlagen"
+msgstr "Namen vorschlagen"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "führe das Löschen aus"
+msgstr "Löschvorgang ausführen"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Dateien werden hoch geladen"
 
@@ -169,79 +145,87 @@ msgstr "Der Dateiname darf nicht leer sein."
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "Ungültiger Name! Die Zeichen '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
+msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ihr Speicher ist voll. Daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
+msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien einen Moment dauern."
+msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
+msgstr "Ihre Datei kann nicht hochgeladen werden, weil es sich um einen Ordner handelt oder 0 Bytes groß ist."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nicht genügend Speicherplatz verfügbar"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
+msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Bearbeitet"
+msgstr "Geändert"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} Dateien"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Konnte Datei nicht umbenennen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Hochladen"
@@ -302,40 +286,40 @@ msgstr "Gelöschte Dateien"
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Alles leer. Bitte laden Sie etwas hoch!"
+msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scanne"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Aktualisiere den Dateisystem-Cache..."
+msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index f69dc4f485301ac1d8e8e3a3634055d9fd324212..c01a4a7f13ada33bb756e92db8f18df0068fcd31 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@kaio.ws>, 2013.
-# Andreas Tangemann <a.tangemann@web.de>, 2013.
-#   <driz@i2pmail.org>, 2012.
-# Marc-Andre Husyk <member@wue.de>, 2013.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# Susi <>, 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-02-17 00:24+0100\n"
-"PO-Revision-Date: 2013-02-16 23:00+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-06-01 01:58+0200\n"
+"PO-Revision-Date: 2013-05-31 22: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,22 +18,87 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert."
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert."
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Das Passwort wurde erfolgreich 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 nicht richtig."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Datei-Verschlüsselung ist aktiviert"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Account-Passwort wiederherstellen"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Altes Passwort für die Account-Wiederherstellung"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Neues Passwort für die Account-Wiederherstellung"
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
 
 #: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Die folgenden Dateitypen werden nicht verschlüsselt:"
+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."
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Die folgenden Dateitypen von der Verschlüsselung ausnehmen:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Keine"
+#: templates/settings-personal.php:28
+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 c8c9c48d79168be9ba81a5888f6899e460d01607..61ef1e033dcf6ccfc246e455c295bed283b0bbf5 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -3,19 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-#   <deh3nne@deviantdev.com>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
+# arkascha <foss@christian-reiner.info>, 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\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"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,19 +39,26 @@ msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
 
-#: lib/config.php:426
+#: 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 "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
 
+#: 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 "<b>Achtung:</b> Die Curl-Unterstützung  von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externer Speicher"
@@ -111,7 +114,7 @@ msgstr "Externen Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
+msgstr "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index c1d9610ac763311f86cabfc7be8c973cbd9a7bf7..ddeb20030d3a1b1fb160afcfe584f9b92d1e247d 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:36+0000\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"
-"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
+"Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,26 +23,26 @@ msgstr "Passwort"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr "Absenden"
+msgstr "Bestätigen"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s hat den Ordner %s mit Ihnen geteilt"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s hat die Datei %s mit Ihnen geteilt"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr "Download"
+msgstr "Herunterladen"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
 
-#: templates/public.php:35
+#: 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 ad4f0a4737e62e6045eb2fd6f5f8bba8f0c61a15..ed2b66d7e9e634f68d8c19be2a417d0dea1de33e 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -3,20 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Andreas Tangemann <a.tangemann@web.de>, 2013.
-# I Robot <owncloud-bot@tmit.eu>, 2013.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# Phillip Schichtel <quick_wango@code-infection.de>, 2013.
-#  <stefan.niedermann@googlemail.com>, 2013.
-# Susi <>, 2013.
-# Tristan <blobbyjj@ymail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:08+0200\n"
-"PO-Revision-Date: 2013-04-10 21:41+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\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"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,11 +27,11 @@ msgstr "Konnte %s nicht dauerhaft löschen"
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "Wiederherstellung ausführen"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fehler"
 
@@ -46,31 +39,31 @@ msgstr "Fehler"
 msgid "delete file permanently"
 msgstr "Datei dauerhaft löschen"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index 934aa7d67f85499be05e984e7937e810c6fdd6dd..7d3c1a83c4472ed7dff76099fc21ffdeb139cebf 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -3,23 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-#  <niko@nik-o-mat.de>, 2013.
-#   <niko@nik-o-mat.de>, 2012.
-#  <robert.neumann01@gmail.com>, 2013.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#  <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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-23 21:00+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index c6b2ab3070a54dd01bb46b697dea244107e7fe17..4e9c15c188e47a074ce49cf7d2bb0cd97272e779 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Andreas Tangemann <a.tangemann@web.de>, 2013.
-#   <a.tangemann@web.de>, 2012.
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2013.
-# Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-# Phi Lieb <>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -28,47 +18,47 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "konnte nicht ermittelt werden"
 
@@ -104,10 +94,6 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Datei-Verzeichnis angeben"
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -128,75 +114,79 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle Benutzername und/oder Passwort ungültig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer aus MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle Benutzername und/oder Passwort ungültig"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
 
-#: setup.php:853
+#: setup.php:867
 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 Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
+msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
+msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -204,7 +194,7 @@ msgstr "Gerade eben"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "Vor einer Minute"
+msgstr "Vor 1 Minute"
 
 #: template.php:115
 #, php-format
@@ -250,19 +240,6 @@ msgstr "Letztes Jahr"
 msgid "years ago"
 msgstr "Vor  Jahren"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "aktuell"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Die Update-Überprüfung ist ausgeschaltet"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index fea97607cce9381bb8ac50fc87dd1c891ba02a27..bdca0febe3a23cd568af93b7badb4c1aab3eaef3 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -3,38 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <admin@s-goecker.de>, 2011-2012.
-# Andreas Tangemann <a.tangemann@web.de>, 2013.
-#   <blobbyjj@ymail.com>, 2012.
-#   <icewind1991@gmail.com>, 2012.
-# I Robot <owncloud-bot@tmit.eu>, 2012-2013.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-# Jan T <jan-temesinko@web.de>, 2012.
-# Lukas Reschke <lukas@statuscode.ch>, 2013.
-#   <lukas@statuscode.ch>, 2012.
-#   <mail@felixmoeller.de>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2012-2013.
-#   <nelsonfritsch@gmail.com>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-# Phillip Schichtel <quick_wango@code-infection.de>, 2013.
-#  <robert.neumann01@gmail.com>, 2013.
-#   <seeed@freenet.de>, 2012.
-#  <stefan.niedermann@googlemail.com>, 2013.
-# Susi <>, 2013.
-#   <thomas.mueller@tmit.eu>, 2012.
-#  <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-#   <transifex-2.7.mensaje@spamgourmet.com>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
+# a.tangemann <a.tangemann@web.de>, 2013
+# arkascha <foss@christian-reiner.info>, 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\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"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,12 +25,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Fehler bei der Anmeldung"
+msgstr "Authentifizierungs-Fehler"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Dein Anzeigename ist geändert worden."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Das Ändern des Anzeigenamens ist nicht möglich"
 
@@ -89,7 +72,7 @@ msgstr "Sprache geändert"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Ungültige Anfrage"
+msgstr "Ungültige Anforderung"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -141,52 +124,52 @@ msgstr "Es ist ein Fehler während des Updates aufgetreten"
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -216,7 +199,7 @@ msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfigurie
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>."
+msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -242,7 +225,7 @@ msgstr "Dieser ownCloud-Server kann die Ländereinstellung nicht auf %s ändern.
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr "Keine Netzwerkverbindung"
+msgstr "Keine Internetverbindung"
 
 #: templates/admin.php:78
 msgid ""
@@ -296,7 +279,7 @@ msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr "Erlaube weiterverteilen"
+msgstr "Erlaube Weiterverteilen"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
@@ -304,11 +287,11 @@ msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr "Erlaube Benutzern, mit jedem zu teilen"
+msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr "Erlaube Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
+msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -337,19 +320,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -420,7 +403,7 @@ msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
 msgid "Show First Run Wizard again"
 msgstr "Den Einrichtungsassistenten erneut anzeigen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Passwort"
 
@@ -444,82 +427,74 @@ msgstr "Neues Passwort"
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Ihr Anzeigename wurde geändert"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Das Ändern Ihres Anzeigenamens ist nicht möglich"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Anzeigenamen ändern"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Helfen Sie bei der Ãœbersetzung"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
-msgstr "Anlegen"
+msgstr "Erstellen"
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Admin-Paswort-Wiederherstellung"
 
-#: templates/users.php:35
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "Anzeigenamen ändern"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 0c6b3cde9c312560cf45c2cf76a32d2f895bb1da..39f12159ddde17493d79f96d54195b22b5471a99 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,26 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Andreas Tangemann <a.tangemann@web.de>, 2013.
-#   <blobbyjj@ymail.com>, 2012.
-# I Robot <thomas.mueller@tmit.eu>, 2012.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-# Maurice Preuß <>, 2012.
-#   <niko@nik-o-mat.de>, 2012.
-# Phi Lieb <>, 2012.
-#  <robert.neumann01@gmail.com>, 2013.
-#  <stefan.niedermann@googlemail.com>, 2013.
-# Susi <>, 2013.
-#  <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-#   <transifex-2.7.mensaje@spamgourmet.com>, 2012.
-#   <transifex.3.mensaje@spamgourmet.com>, 2012.
-# Tristan <blobbyjj@ymail.com>, 2013.
+# a.tangemann <a.tangemann@web.de>, 2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -31,9 +20,13 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr "Das Löschen der Server-Konfiguration schlug fehl"
+msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
@@ -43,13 +36,13 @@ msgstr "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werd
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Die Konfiguration ist gültig, aber das Herstellen der Verbindung schlug fehl. Bitte überprüfen Sie die Server-Einstellungen und Zertifikate."
+msgstr "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr "Die Konfiguration ist ungültig. Weitere Details können Sie im ownCloud-Log nachlesen."
+msgstr "Die Konfiguration ist ungültig, sehen Sie für weitere Details bitte im ownCloud Log nach"
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -57,291 +50,373 @@ msgstr "Löschen fehlgeschlagen"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "Sollen die Einstellungen der letzten Serverkonfiguration übernommen werden?"
+msgstr "Einstellungen von letzter Konfiguration übernehmen?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "Einstellungen behalten?"
+msgstr "Einstellungen beibehalten?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
 msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Erfolg"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr "Möchten Sie die Serverkonfiguration wirklich löschen?"
+msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
-#: templates/settings.php:8
+#: 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 "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
+msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
 
-#: templates/settings.php:11
+#: 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 "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverkonfiguration"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "Ein Base DN pro Zeile"
+msgstr "Ein Basis-DN pro Zeile"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:45
+#: 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 "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Lassen Sie die Felder von DN und Passwort für einen anonymen Zugang leer."
+msgstr "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:53
+#: 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 "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
+msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindungseinstellungen"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr "Back-Up (Replikation) Host"
+msgstr "Backup Host (Kopie)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr "Geben Sie einen optionalen Backup-Host an. Es muss ein Replikat des Haupt-LDAP/AD Servers sein."
+msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr "Back-Up (Replikation) Port"
+msgstr "Backup Port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Hauptserver deaktivieren"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Wenn eingeschaltet, wird sich die ownCloud nur mit dem Replikat-Server verbinden."
+msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr "Benutze TLS"
+msgstr "Nutze TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Speichere Time-To-Live zwischen"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr "Verzeichniseinstellungen"
+msgstr "Ordnereinstellungen"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "Ein Benutzer Base DN pro Zeile"
+msgstr "Ein Benutzer Basis-DN pro Zeile"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr "Eigenschaften der Benutzer-Suche"
+msgstr "Benutzersucheigenschaften"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optional; ein Attribut pro Zeile"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "Ein Gruppen Base DN pro Zeile"
+msgstr "Ein Gruppen Basis-DN pro Zeile"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr "Eigenschaften der Gruppen-Suche"
+msgstr "Gruppensucheigenschaften"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr "Besondere Eigenschaften"
+msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interner Benutzername"
+
+#: 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 "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichenwerden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Übereinstimmungen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses in ownCloud. Es dient weiterhin als Port für Remote-URLs - zum Beispiel für alle *DAV-Dienste Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich einzig und allein nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "UUID-Erkennung überschreiben"
+
+#: 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 "UUID-Attribut:"
+
+#: 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 "Testkonfiguration"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index da76dff3ac094faaf507970261d192a2c02c62c4..44670121a4ede3a026c0bd129edaca449cb756a4 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <a.tangemann@web.de>, 2012-2013.
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013.
-#   <multimill@gmail.com>, 2012.
-#  <transifex-2.7.mensaje@spamgourmet.com>, 2013.
-#   <transifex-2.7.mensaje@spamgourmet.com>, 2012.
+# a.tangemann <a.tangemann@web.de>, 2012-2013
+# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# multimill <multimill@gmail.com>, 2012
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-21 00:03+0100\n"
-"PO-Revision-Date: 2013-03-20 08:40+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\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"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 4a9080289c4134de84e1fe11bb0ce040bf16397b..6b4cbdb4814350f128c72ab81329b5e5f5b181a0 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,23 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# axil Pι <axilleas@archlinux.gr>, 2012.
-# Dimitris M. <monopatis@gmail.com>, 2012-2013.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
-# Marios Bekatoros <>, 2012.
-#   <petros.kyladitis@gmail.com>, 2011.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
-#  <vagelis@cyberdest.com>, 2013.
-# Wasilis Mandratzis <m.wasilis@yahoo.de>, 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-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 01:20+0000\n"
-"Last-Translator: Wasilis <m.wasilis@yahoo.de>\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: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,78 +162,82 @@ msgstr "Δεκέμβριος"
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 λεπτό πριν"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} λεπτά πριν"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ώρα πριν"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ώρες πριν"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} ημέρες πριν"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} μήνες πριν"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "χρόνια πριν"
 
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Οκ"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Επιλέξτε"
 
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Επιλέξτε"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ναι"
 
-#: js/oc-dialogs.js:222
+#: 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."
@@ -303,7 +299,7 @@ msgstr "Διαμοιρασμός με σύνδεσμο"
 msgid "Password protect"
 msgstr "Προστασία συνθηματικού"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Συνθηματικό"
 
@@ -406,24 +402,27 @@ msgstr "Επαναφορά συνθηματικού ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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 "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή "
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Η επαναφορά του email στάλθηκε."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? "
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Η αίτηση απέτυχε!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Όνομα Χρήστη"
+msgstr "Όνομα χρήστη"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Επαναφορά αίτησης"
 
@@ -529,75 +528,80 @@ msgstr "Για προχωρημένους"
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Ρύθμιση της βάσης δεδομένων"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Χρήστης της βάσης δεδομένων"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Συνθηματικό βάσης δεδομένων"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Κενά Πινάκων Βάσης Δεδομένων"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
+msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Απορρίφθηκε η αυτόματη σύνδεση!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ξεχάσατε το συνθηματικό σας;"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "απομνημόνευση"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Είσοδος"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Εναλλακτικές Συνδέσεις"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 1ec53c03b2a6d28287252c0d1695f572a4a6aeb9..7ab2df8363019703d7c4e1a8d51ffa3c50f5b9f1 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,23 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Axilleas Pi <axilleas@archlinux.gr>, 2013.
-# Dimitris M. <monopatis@gmail.com>, 2012-2013.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012-2013.
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
-# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
-# Marios Bekatoros <>, 2012.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2013.
-# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 13:20+0000\n"
-"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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,10 +28,6 @@ msgstr "Αδυναμία μετακίνησης του %s - υπάρχει ήδ
 msgid "Could not move %s"
 msgstr "Αδυναμία μετακίνησης του %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Αδυναμία μετονομασίας αρχείου"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
@@ -58,7 +45,7 @@ msgstr "Το αρχείο που εστάλει υπερβαίνει την οδ
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα"
+msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -88,55 +75,59 @@ msgstr "Μη έγκυρος φάκελος."
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Διαμοιρασμός"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "εκτέλεση της διαδικασίας διαγραφής"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 αρχείο ανεβαίνει"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "αρχεία ανεβαίνουν"
 
@@ -162,72 +153,80 @@ msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτο
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Αδυναμία στην αποστολή του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Η URL δεν μπορεί να είναι κενή."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από το ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Αδυναμία μετονομασίας αρχείου"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Αποστολή"
+msgstr "Μεταφόρτωση"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -285,37 +284,37 @@ msgstr "Διαγραμμένα αρχεία"
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Δεν έχετε δικαιώματα εγγραφής εδώ."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Διακοπή κοινής χρήσης"
+msgstr "Σταμάτημα διαμοιρασμού"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
 
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 7196402db423993479cc1d90a1195bcb8ba24ea6..d5c014762f255de183c42ea7be5c4b07df75eff8 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2013.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -20,22 +17,87 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Γίνεται αποθήκευση..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Η κρυπτογράφηση αρχείων είναι ενεργή."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Οι παρακάτω τύποι αρχείων δεν θα κρυπτογραφηθούν:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Εξαίρεση των παρακάτω τύπων αρχείων από την κρυπτογράφηση:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Καμία"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index ae3b35b0c8970c42e7eda2aa46888c9a1b1eeffa..fc7d4ed7cce144318b42b8e44a59a8186402454c 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
-# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2012.
-# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
-# Γιάννης <yannanth@gmail.com>, 2012.
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
+# 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-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 01:50+0000\n"
-"Last-Translator: Wasilis <m.wasilis@yahoo.de>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,19 +38,26 @@ msgstr "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox κα
 msgid "Error configuring Google Drive storage"
 msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
 
-#: lib/config.php:424
+#: 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 "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
 
-#: lib/config.php:427
+#: 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 "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
 
+#: 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 "<Προειδοποίηση </b> Η υποστήριξη του συστήματος Curl στο PHP δεν είναι ενεργοποιημένη ή εγκαταστημένη. Η αναπαραγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. Παρακαλώ ρωτήστε τον διαχειριστλη του συστήματος για την εγκατάσταση. "
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Εξωτερικό Αποθηκευτικό Μέσο"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index d5a761b6f70d7aeb251f93390ca0521b5d8d4384..03675fb211413a572b359f0172d4e87f62695d99 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 01:07+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\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"
 "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"
@@ -28,24 +25,24 @@ msgstr "Συνθηματικό"
 msgid "Submit"
 msgstr "Καταχώρηση"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s μοιράστηκε τον φάκελο %s μαζί σας"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s μοιράστηκε το αρχείο %s μαζί σας"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
 
-#: templates/public.php:37
+#: 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 b02cc3bed5f843bf633fd79bf7d91d0d7b2c4fab..cfdf141df089493bb00fcdcd7d2411af65bfbda7 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
 msgid "Couldn't restore %s"
 msgstr "Αδυναμία επαναφοράς %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "εκτέλεση λειτουργία επαναφοράς"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -40,31 +39,31 @@ msgstr "Σφάλμα"
 msgid "delete file permanently"
 msgstr "μόνιμη διαγραφή αρχείου"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Διαγράφηκε"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 2430051648a2943de379c0a7f38cd169b714a1e2..c0a78762a845887bf4584d3ae2993b9cca6fd2b3 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2012-2013.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
-# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 01:50+0000\n"
-"Last-Translator: Wasilis <m.wasilis@yahoo.de>\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"
 "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"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 31df5b65e9349888b89efad829d6301c5fbc575f..b47527a018a7b9a6708c1dc106d8b313481b6ffb 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2013.
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
-#  <vagelis@cyberdest.com>, 2013.
-# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 01:50+0000\n"
-"Last-Translator: Wasilis <m.wasilis@yahoo.de>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:33+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,47 +17,47 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Χρήστες"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Εφαρμογές"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Διαχειριστής"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "δεν μπορούσε να προσδιορισθεί"
 
@@ -98,10 +93,6 @@ msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
 msgid "Set an admin password."
 msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Καθορίστε τον φάκελο δεδομένων."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -122,72 +113,76 @@ msgstr "%s μάλλον δεν χρησιμοποιείτε τελείες στ
 msgid "%s set the database host."
 msgstr "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. "
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή."
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
@@ -220,7 +215,7 @@ msgstr "σήμερα"
 
 #: template.php:119
 msgid "yesterday"
-msgstr "χθές"
+msgstr "χτες"
 
 #: template.php:120
 #, php-format
@@ -229,7 +224,7 @@ msgstr "%d ημέρες πριν"
 
 #: template.php:121
 msgid "last month"
-msgstr "τον προηγούμενο μήνα"
+msgstr "τελευταίο μήνα"
 
 #: template.php:122
 #, php-format
@@ -238,25 +233,12 @@ msgstr "%d μήνες πριν"
 
 #: template.php:123
 msgid "last year"
-msgstr "τον προηγούμενο χρόνο"
+msgstr "τελευταίο χρόνο"
 
 #: template.php:124
 msgid "years ago"
 msgstr "χρόνια πριν"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s είναι διαθέσιμο. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ενημερωμένο"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index ab720d7943875f79d8dddf3429c1a6f095ab86b3..82c5279ebae341266cf9457d5bf839866118ddb6 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,27 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2012-2013.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
-# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
-# <icewind1991@gmail.com>, 2012.
-#   <icewind1991@gmail.com>, 2012.
-# Marios Bekatoros <>, 2012.
-# Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
-# <petros.kyladitis@gmail.com>, 2011.
-#   <petros.kyladitis@gmail.com>, 2011.
-# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
-#  <vagelis@cyberdest.com>, 2013.
-# Wasilis Mandratzis <m.wasilis@yahoo.de>, 2013.
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
+# 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-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 01:40+0000\n"
-"Last-Translator: Wasilis <m.wasilis@yahoo.de>\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"
 "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"
@@ -35,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Το όνομα σας στην οθόνη άλλαξε. "
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Δεν είναι δυνατή η αλλαγή του ονόματος εμφάνισης"
 
@@ -130,52 +121,52 @@ msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογή
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Αποθήκευση..."
+msgstr "Γίνεται αποθήκευση..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "διαγράφηκε"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Αδυναμία αφαίρεση χρήστη"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Ομάδα Διαχειριστών"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "προσθήκη ομάδας"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Σφάλμα δημιουργίας χρήστη"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -326,19 +317,19 @@ msgstr "Καταγραφές"
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Λιγότερα"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -409,7 +400,7 @@ msgstr "Λήψη της εφαρμογής για συγχρονισμό των
 msgid "Show First Run Wizard again"
 msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Συνθηματικό"
 
@@ -433,82 +424,74 @@ msgstr "Νέο συνθηματικό"
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Όνομα εμφάνισης"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Το όνομα εμφάνισής σας άλλαξε"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Αλλαγή ονόματος εμφάνισης"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Email"
+msgstr "Ηλ. ταχυδρομείο"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Προκαθορισμένη Αποθήκευση "
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Απεριόριστο"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "Άλλα"
+msgstr "Άλλο"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Αποθήκευση"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "αλλαγή ονόματος εμφάνισης"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "επιλογή νέου κωδικού"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Προκαθορισμένο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index a2995398ea96ae2d93f506005b6f215372a1aceb..fe6c6a8f1c710462ad04068a229ee77babee72a6 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -3,18 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <anastasia2501@hotmail.com>, 2012.
-# Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
-# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
-# Marios Bekatoros <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +17,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Αποτυχία διαγραφής ρυθμίσεων διακομιστή"
@@ -49,7 +47,7 @@ msgstr "Η διαγραφή απέτυχε"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -59,281 +57,363 @@ msgstr "Διατήρηση ρυθμίσεων;"
 msgid "Cannot add server configuration"
 msgstr "Αδυναμία προσθήκης ρυθμίσεων διακομιστή"
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Επιβεβαίωση Διαγραφής"
 
-#: templates/settings.php:8
+#: 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 "<b>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές."
 
-#: templates/settings.php:11
+#: 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 "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Ρυθμίσεις Διακομιστή"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Προσθήκη Ρυθμίσεων Διακομιστή"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Διακομιστής"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Ένα DN Βάσης ανά γραμμή "
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: 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 "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "User Login Filter"
 
-#: templates/settings.php:53
+#: 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 "Καθορίζει το φίλτρο που θα ισχύει κατά την προσπάθεια σύνδεσης χρήστη. %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. "
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "χρησιμοποιήστε τη μεταβλητή %%uid, π.χ. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση επαφών."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=άτομο\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Καθορίζει το φίλτρο που θα ισχύει κατά την ανάκτηση ομάδων."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "χωρίς κάποια μεταβλητή, π.χ. \"objectClass=ΟμάδαPosix\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Ρυθμίσεις Σύνδεσης"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "Ενεργοποιηση ρυθμισεων"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. "
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Host "
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Απενεργοποιηση του κεντρικου διακομιστη"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Όταν ενεργοποιηθεί, με το ownCloud θα συνδεθείτε με το διακομιστή ρεπλίκα."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Χρήση TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Μην το χρησιμοποιήσετε επιπροσθέτως, για LDAPS συνδέσεις , θα αποτύχει."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Εάν η σύνδεση δουλεύει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ρυθμίσεις Καταλόγου"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Πεδίο Ονόματος Χρήστη"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος χρήστη του ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Ένα DN βάσης χρηστών ανά γραμμή"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Χαρακτηριστικά αναζήτησης των χρηστών "
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή "
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Η ιδιότητα LDAP που θα χρησιμοποιείται για τη δημιουργία του ονόματος ομάδας του ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Μια ομαδικη Βάση DN ανά γραμμή"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Ομάδα Χαρακτηριστικων Αναζήτηση"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "Ειδικά Χαρακτηριστικά "
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "Ποσοσταση πεδιου"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "Προκαθισμενο πεδιο"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "Email τυπος"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:99
-msgid "Test Configuration"
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:99
+#: 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/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index ae9fa402bf85a1db0e5f3115e947fc857febf1e7..3a75e3ceaee1f04c8436901bdcff2572d50dfbe5 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
-# Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
-# Marios Bekatoros <>, 2013.
+# Dimitris M. <monopatis@gmail.com>, 2012
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2012
+# 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-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 08:10+0000\n"
-"Last-Translator: Marios Bekatoros <>\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"
 "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"
@@ -29,7 +29,7 @@ msgstr "Αυθεντικοποίηση μέσω WebDAV "
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..63750feeb39d98c95228691c95e7cda1cb7b899e
--- /dev/null
+++ b/l10n/en@pirate/core.po
@@ -0,0 +1,618 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# lhpalacio <luizhenrique_gomespalacio@hotmail.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"
+"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: 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"
+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:121
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
+
+#: js/oc-dialogs.js:161
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
+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 ""
+
+#: 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 "Passcode"
+
+#: 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:48
+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:21
+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/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr ""
+
+#: 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.guest.php:40
+msgid "web services under your control"
+msgstr "web services under your control"
+
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
+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/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/en@pirate/files.po b/l10n/en@pirate/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..1a2619c71ec223d3f3c1eead9e84033469ad2441
--- /dev/null
+++ b/l10n/en@pirate/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:259
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:306
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:306
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:331
+msgid "perform delete operation"
+msgstr ""
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:231
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:264
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
+
+#: js/files.js:317
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:413
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:486
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:491
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr ""
+
+#: js/files.js:877 templates/index.php:69
+msgid "Name"
+msgstr ""
+
+#: js/files.js:878 templates/index.php:80
+msgid "Size"
+msgstr ""
+
+#: js/files.js:879 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:898
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:900
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:908
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:910
+msgid "{count} files"
+msgstr ""
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr ""
+
+#: 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 "Download"
+
+#: 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/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..f27a3729d619264ef721582422ea391daa116379
--- /dev/null
+++ b/l10n/en@pirate/files_encryption.po
@@ -0,0 +1,103 @@
+# 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-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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..a7724b86bee6b685af8bc83042b35e0f8992494f
--- /dev/null
+++ b/l10n/en@pirate/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..f3c697a2c9893845af1ecde83f82c7df7f5f208e
--- /dev/null
+++ b/l10n/en@pirate/files_sharing.po
@@ -0,0 +1,49 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# lhpalacio <luizhenrique_gomespalacio@hotmail.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: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr "Secret Code"
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr "Submit"
+
+#: templates/public.php:10
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr "%s shared the folder %s with you"
+
+#: templates/public.php:13
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr "%s shared the file %s with you"
+
+#: templates/public.php:19 templates/public.php:43
+msgid "Download"
+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/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..3ae46bccb49090d385f5bd9b8ccde433ad6dcf1f
--- /dev/null
+++ b/l10n/en@pirate/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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:96
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:175 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:184
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:196
+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/en@pirate/files_versions.po b/l10n/en@pirate/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..2df316a89241f58dd0b18adfc52dece6ca7d7b06
--- /dev/null
+++ b/l10n/en@pirate/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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/en@pirate/lib.po b/l10n/en@pirate/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..be031f5ebd53adb8c5285c6071b60ba6711e81c0
--- /dev/null
+++ b/l10n/en@pirate/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-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app.php:357
+msgid "Help"
+msgstr ""
+
+#: app.php:370
+msgid "Personal"
+msgstr ""
+
+#: app.php:381
+msgid "Settings"
+msgstr ""
+
+#: app.php:393
+msgid "Users"
+msgstr ""
+
+#: app.php:406
+msgid "Apps"
+msgstr ""
+
+#: app.php:414
+msgid "Admin"
+msgstr ""
+
+#: files.php:207
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:208
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:209 files.php:242
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:239
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: helper.php:228
+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:132 setup.php:329 setup.php:374
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:238
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:237
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:309
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:314
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:315
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:644
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:867
+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
+#, 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/en@pirate/settings.po b/l10n/en@pirate/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..2dd26cf0d9d21d81c2968714e6eefb2e08b653d5
--- /dev/null
+++ b/l10n/en@pirate/settings.po
@@ -0,0 +1,496 @@
+# 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-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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:24
+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 ""
+
+#: 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:83
+#: templates/users.php:108
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:160
+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:105
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:237 templates/personal.php:108
+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:11
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:12
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:34
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:36
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:38
+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:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+msgid "Password"
+msgstr "Passcode"
+
+#: templates/personal.php:38
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:44
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:68
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:70
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:71
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:77 templates/personal.php:78
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:80
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:44 templates/users.php:138
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:62 templates/users.php:153
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:87
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:98
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:102
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:133
+msgid "Default"
+msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..ffa7973ace000da2b7ead4454ea1dc12ff90b9ef
--- /dev/null
+++ b/l10n/en@pirate/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-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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Passcode"
+
+#: 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/en@pirate/user_webdavauth.po b/l10n/en@pirate/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..055e077694ef7cc666fb06787c763457e5117b78
--- /dev/null
+++ b/l10n/en@pirate/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en@pirate\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+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/eo/core.po b/l10n/eo/core.po
index 0bbc53841145e624963a2daab18d140bd992c9f9..397f0b429db5685c7e2e3066fb195d1ac5b59dff 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano  <mstreet@kde.org.ar>, 2012.
-# Michael Moroni <haikara90@gmail.com>, 2012.
-#   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -163,75 +160,79 @@ msgstr "Decembro"
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundoj antaÅ­e"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "antaÅ­ 1 minuto"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "antaÅ­ {minutes} minutoj"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "antaÅ­ 1 horo"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "antaÅ­ {hours} horoj"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hodiaÅ­"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "hieraÅ­"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "antaÅ­ {days} tagoj"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "antaÅ­ {months} monatoj"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "monatoj antaÅ­e"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "jaroj antaÅ­e"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Elekti"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Jes"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ne"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Akcepti"
 
@@ -296,7 +297,7 @@ msgstr "Kunhavigi per ligilo"
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -399,24 +400,27 @@ msgstr "La pasvorto de ownCloud restariĝis."
 msgid "Use the following link to reset your password: {link}"
 msgstr "Uzu la jenan ligilon por restarigi vian pasvorton: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Peto malsukcesis!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Peti rekomencigon"
 
@@ -522,75 +526,80 @@ msgstr "Progresinta"
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "estos uzata"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datumbaza tabelospaco"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "TTT-servoj sub via kontrolo"
+msgstr "TTT-servoj regataj de vi"
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Elsaluti"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "memori"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 12e93af73b7e986c05b4e74f4ef87973afd9c5e6..2928a0b2ceaf56af1ad15787b0930aa47c2e5703 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano <mstreet@kde.org.ar>, 2013.
-# Mariano  <mstreet@kde.org.ar>, 2012.
-#   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -30,17 +27,13 @@ msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
 msgid "Could not move %s"
 msgstr "Ne eblis movi %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Ne eblis alinomigi dosieron"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese"
+msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
 #: ajax/upload.php:27
 msgid ""
@@ -55,15 +48,15 @@ msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinit
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "La alŝutita dosiero nur parte alŝutiĝis"
+msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Neniu dosiero estas alŝutita"
+msgstr "Neniu dosiero alŝutiĝis."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Mankas tempa dosierujo"
+msgstr "Mankas provizora dosierujo."
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -81,57 +74,61 @@ msgstr "Nevalida dosierujo."
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Kunhavigi"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "anstataÅ­igi"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 dosiero estas alŝutata"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "dosieroj estas alŝutataj"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -155,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ne haveblas sufiĉa spaco"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Eraro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
+#: 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 "Ne eblis alinomigi dosieron"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Alŝuti"
@@ -278,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Elŝuto tro larĝa"
+msgstr "Alŝuto tro larĝa"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Nuna skano"
 
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 1a1260fd41311b86a4b74a259f1d11121d5be038..907d1a9902edac5dad55f1898c48093106c738e5 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Konservante..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenio"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 0483d097fd9f276ee914f6640d7c49b58d066b18..5191563428e3f795f459aeaffb26b53df0b570e9 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +37,26 @@ msgstr "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan."
 msgid "Error configuring Google Drive storage"
 msgstr "Eraro dum agordado de la memorservo Google Drive"
 
-#: lib/config.php:423
+#: 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:426
+#: 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 "Malena memorilo"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index e9778f8450ca1a365ab5657580360f77ebb1934f..2b7afc9e2cf19c2f1a8adf790d7ef512dcf903ae 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 03:01+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Pasvorto"
 msgid "Submit"
 msgstr "Sendi"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s kunhavigis la dosierujon %s kun vi"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s kunhavigis la dosieron %s kun vi"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ne haveblas antaÅ­vido por"
 
-#: templates/public.php:35
+#: 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 358cb293a87fb63fefc4524b583eaaac219c1d18..67bafc70add172e71d187146801c0cb74dcb4d17 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Eraro"
 
@@ -39,31 +39,31 @@ msgstr "Eraro"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nomo"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index f065928dfb8c636f6b6b0f58b2e183dc597c9dcc..afca16226f037b0adb951968fca38198b982ab66 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <kristjan.schmidt@googlemail.com>, 2013.
-# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-04-01 18:50+0000\n"
-"Last-Translator: kristjan <kristjan.schmidt@googlemail.com>\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"
 "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"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 81adfbc7bb85588e3efa2694a5be5c9d8a698ed9..97d492851cf21027824c943d7be38bde35b8081f 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administranto"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,79 +113,83 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "sekundojn antaÅ­e"
+msgstr "sekundoj antaÅ­e"
 
 #: template.php:114
 msgid "1 minute ago"
@@ -225,7 +224,7 @@ msgstr "antaÅ­ %d tagoj"
 
 #: template.php:121
 msgid "last month"
-msgstr "lasta monato"
+msgstr "lastamonate"
 
 #: template.php:122
 #, php-format
@@ -234,24 +233,11 @@ msgstr "antaÅ­ %d monatoj"
 
 #: template.php:123
 msgid "last year"
-msgstr "lasta jaro"
+msgstr "lastajare"
 
 #: template.php:124
 msgid "years ago"
-msgstr "jarojn antaÅ­e"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ĝisdata"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "ĝisdateckontrolo estas malkapabligita"
+msgstr "jaroj antaÅ­e"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index b827ba5c85254211c1d7a6a3b535b251cdd57aef..8ef84796bb463d1ba805661aa69a5a31a80228c2 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano <mstreet@kde.org.ar>, 2013.
-# Mariano  <mstreet@kde.org.ar>, 2012.
-#   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "AÅ­tentiga eraro"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -119,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "forigita"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "malfari"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupoj"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupadministranto"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -234,7 +235,7 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
@@ -254,39 +255,39 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Kunhavigo"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Kapabligi API-on por Kunhavigo"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Kapabligi ligilojn"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Kapabligi rekunhavigon"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -309,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Protokolo"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Registronivelo"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -422,82 +423,74 @@ msgstr "Nova pasvorto"
 msgid "Change password"
 msgstr "Ŝanĝi la pasvorton"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Via retpoŝta adreso"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Krei"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "DefaÅ­lta konservejo"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Senlima"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Konservejo"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "DefaÅ­lta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 05c28a8824aef29e66feac8b8bc70aae18a6f492..423b1e96e445765db65391d6de9ed7c8e3dd917a 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano <mstreet@kde.org.ar>, 2013.
-# Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +17,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -55,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukceso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Eraro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gastigo"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Bazo-DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uzanto-DN"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtrilo de uzantensaluto"
 
-#: templates/settings.php:53
+#: 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 "Äœi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataÅ­igas la uzantonomon en la ensaluta ago."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrilo de uzantolisto"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtrilo de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Uzi TLS-on"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ne rekomendata, uzu ĝin nur por testoj."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Kampo de vidignomo de uzanto"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Kampo de vidignomo de grupo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lasu malplena por uzantonomo (defaÅ­lto). Alie, specifu LDAP/AD-atributon."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index d9f66ba5177fb4168c2b8e63e03b5e9160b34d1d..aa3b42b411916dd90f8e972606e3f77de8d49028 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano <mstreet@kde.org.ar>, 2013.
-# Mariano  <mstreet@kde.org.ar>, 2012.
+# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-21 00:04+0100\n"
-"PO-Revision-Date: 2013-01-20 01:16+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "WebDAV-aÅ­tentigo"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 6603509b339174b3b296fe512116fbfa57709f05..4cbaefc3500976ae134b788998e3fc98b47a64a3 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,27 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Felix Liberio <felix.liberio@gmail.com>, 2013.
-#   <javierkaiser@gmail.com>, 2012.
-# Javier Llorente <javier@opensuse.org>, 2012.
-#  <juanma@kde.org.ar>, 2013.
-#   <juanma@kde.org.ar>, 2011-2013.
-#   <malmirk@gmail.com>, 2012.
-# oSiNaReF  <>, 2012.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
-#   <rodrigo.calvo@gmail.com>, 2012.
-#   <rom1dep@gmail.com>, 2011.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#   <sergioballesterossolanas@gmail.com>, 2011-2012.
-#   <sergio@entrecables.com>, 2012.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
+# ggam <ggam@brainleakage.com>, 2013
+# msoko <sokolovitch@yahoo.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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -34,30 +24,30 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "El usuario %s ha compartido un archivo contigo"
+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"
+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"
+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"
+msgstr "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s."
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Tipo de categoria no proporcionado."
+msgstr "Tipo de categoría no proporcionado."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -66,19 +56,19 @@ msgstr "¿Ninguna categoría para añadir?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "Esta categoria ya existe: %s"
+msgstr "Ya existe esta categoría: %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 "ipo de objeto no proporcionado."
+msgstr "Tipo de objeto no proporcionado."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID no proporcionado."
+msgstr "ID de %s no proporcionado."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
@@ -174,82 +164,86 @@ msgstr "Diciembre"
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Hace {hours} horas"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
-msgstr "mes pasado"
+msgstr "el mes pasado"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Hace {months} meses"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
-msgstr "año pasado"
+msgstr "el año pasado"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "hace años"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "No"
+
+#: 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 "El tipo de objeto no se ha especificado."
+msgstr "No se ha especificado el tipo de objeto"
 
 #: 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
@@ -257,15 +251,15 @@ msgstr "El tipo de objeto no se ha especificado."
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr "Fallo"
+msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "El nombre de la app no se ha especificado."
+msgstr "No se ha especificado el nombre de la aplicación."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "El fichero  {file} requerido, no está instalado."
+msgstr "¡El fichero requerido {file} no está instalado!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
@@ -307,7 +301,7 @@ msgstr "Compartir con enlace"
 msgid "Password protect"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contraseña"
 
@@ -329,7 +323,7 @@ msgstr "Fecha de caducidad"
 
 #: js/share.js:211
 msgid "Share via email:"
-msgstr "compartido via e-mail:"
+msgstr "Compartido por correo electrónico:"
 
 #: js/share.js:213
 msgid "No people found"
@@ -345,7 +339,7 @@ msgstr "Compartido en {item} con {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "No compartir"
+msgstr "Dejar de compartir"
 
 #: js/share.js:320
 msgid "can edit"
@@ -361,7 +355,7 @@ msgstr "crear"
 
 #: js/share.js:328
 msgid "update"
-msgstr "modificar"
+msgstr "actualizar"
 
 #: js/share.js:331
 msgid "delete"
@@ -396,7 +390,7 @@ 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 "La actualización ha fracasado. Por favor, informe este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>."
+msgstr "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>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
@@ -404,36 +398,39 @@ msgstr "La actualización se ha realizado correctamente. Redireccionando a ownCl
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr "Reiniciar contraseña de ownCloud"
+msgstr "Restablecer 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}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Recibirás un enlace por correo electrónico para restablecer tu contraseña"
+#: 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 "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."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Email de reconfiguración enviado."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Pedido fallado!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Tu contraseña se ha restablecido"
+msgstr "Su contraseña ha sido establecida"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -461,7 +458,7 @@ msgstr "Aplicaciones"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrador"
+msgstr "Administración"
 
 #: strings.php:9
 msgid "Help"
@@ -481,7 +478,7 @@ msgstr "Editar categorías"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "Añadir"
+msgstr "Agregar"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -494,7 +491,7 @@ msgstr "La 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."
-msgstr "Por favor, actualice su instalación de PHP para utilizar ownCloud en forma segura."
+msgstr "Por favor, actualice su instalación de PHP para utilizar ownCloud de manera segura."
 
 #: templates/installation.php:32
 msgid ""
@@ -506,13 +503,13 @@ msgstr "No está disponible un generador de números aleatorios seguro, por favo
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta."
+msgstr "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."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Su directorio de datos y sus archivos están probablemente accesibles a través de internet ya que el archivo .htaccess no está funcionando."
+msgstr "Probablemente su directorio de datos y sus archivos sean accesibles a través de internet ya que el archivo .htaccess no funciona."
 
 #: templates/installation.php:40
 msgid ""
@@ -523,7 +520,7 @@ msgstr "Para información sobre cómo configurar adecuadamente su servidor, por
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr "Crea una <strong>cuenta de administrador</strong>"
+msgstr "Crear una <strong>cuenta de administrador</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
@@ -533,75 +530,80 @@ msgstr "Avanzado"
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "se utilizarán"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "servicios web bajo tu control"
+msgstr "Servicios web bajo su control"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Salir"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "¡Inicio de sesión automático rechazado!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
-msgstr "¿Has perdido tu contraseña?"
+msgstr "¿Ha perdido su contraseña?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
-msgstr "recuérdame"
+msgstr "recordarme"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Nombre de usuarios alternativos"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 7f43e11c295f1dace3a76a3e3f54117e1a87a78e..686eeea90fb26adfd41190a9025ddb81e5404a64 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,27 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <>, 2012.
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-#  <davidlopez.david@gmail.com>, 2013.
-#   <devianpctek@gmail.com>, 2012.
-# Javier Llorente <javier@opensuse.org>, 2012.
-#  <juanma@kde.org.ar>, 2013.
-#   <juanma@kde.org.ar>, 2012-2013.
-#   <karvayoEdgar@gmail.com>, 2013.
-# Ricardo A. Hermosilla Carrillo <ra.hermosillac@gmail.com>, 2013.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#  <sergioballesterossolanas@gmail.com>, 2013.
-#   <sergioballesterossolanas@gmail.com>, 2011-2012.
-#   <sergio@entrecables.com>, 2012.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
+# Art O. Pal <artopal@fastmail.fm>, 2013
+# ggam <ggam@brainleakage.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 17:20+0000\n"
-"Last-Translator: telco2011 <davidlopez.david@gmail.com>\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"
 "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"
@@ -41,17 +29,13 @@ msgstr "No se puede mover %s - Ya existe un archivo con ese nombre"
 msgid "Could not move %s"
 msgstr "No se puede mover %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "No se puede renombrar el archivo"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Fallo no se subió el fichero"
+msgstr "No se subió ningún archivo. Error desconocido"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "No se ha producido ningún error, el archivo se ha subido con éxito"
+msgstr "No hay ningún error, el archivo se ha subido con éxito"
 
 #: ajax/upload.php:27
 msgid ""
@@ -62,11 +46,11 @@ msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la varia
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "El archivo que intentas subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
+msgstr "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "El archivo que intentas subir solo se subió parcialmente"
+msgstr "El archivo se ha subido parcialmente"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -74,7 +58,7 @@ msgstr "No se ha subido ningún archivo"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Falta un directorio temporal"
+msgstr "Falta la carpeta temporal"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -92,61 +76,65 @@ msgstr "Directorio invalido."
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pendiente"
+msgstr "Pendientes"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Eliminar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "subiendo archivos"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr "'.' es un nombre de archivo inválido."
+msgstr "'.' no es un nombre de archivo válido."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
@@ -160,75 +148,83 @@ msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Su almacenamiento esta lleno, los archivos no pueden ser mas actualizados o sincronizados!"
+msgstr "Su almacenamiento está lleno, ¡no se pueden actualizar ni sincronizar archivos!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Su almacenamiento esta lleno en un  ({usedSpacePercent}%)"
+msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
+msgstr "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son muy grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
+msgstr "Imposible subir su archivo, es un directorio o tiene 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
+msgstr "La subida del archivo está en proceso. Si sale de la página ahora, se cancelará la subida."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
+msgstr "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} archivos"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "No se puede renombrar el archivo"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Subir"
@@ -289,40 +285,40 @@ msgstr "Archivos eliminados"
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "No tienes permisos para escribir aquí."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí no hay nada. ¡Sube algo!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "El archivo es demasiado grande"
+msgstr "Subida demasido grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor espere."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr "Ahora escaneando"
+msgstr "Escaneo actual"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Actualizando cache de archivos de sistema"
+msgstr "Actualizando caché del sistema de archivos"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index f4c68c14f4c90f4cb7598baa6b5431dfc640ada0..21f59f5c76089d4638b236ff56d9215849a1da20 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Felix Liberio <felix.liberio@gmail.com>, 2013.
-#   <juanma@kde.org.ar>, 2012.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
+# gmoriello <gmoriello@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -21,22 +18,87 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Se ha habilitado la recuperación de archivos"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña."
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Clave de recuperación deshabilitada"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Su contraseña ha sido cambiada"
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La encriptacion de archivo esta activada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Habilitar clave de recuperación de contraseñas ():"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Recuperar contraseña"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Habilitar"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr "Contraseña de recuperación actual"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Contraseña de recuperación nueva"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Los siguientes tipos de archivo no seran encriptados:"
+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"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir los siguientes tipos de archivo de la encriptacion:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Opciones de recuperación de archivos actualizada"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ninguno"
+#: templates/settings-personal.php:28
+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 e61835c6eae2582db277bdf746a816088b658220..648f74a81164d41ef628303a6cc748fa41343b74 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
-# Javier Llorente <javier@opensuse.org>, 2012.
-# Marcos <djoser.horus@gmail.com>, 2013.
-#   <pedro.navia@etecsa.cu>, 2012.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Marcos <djoser.horus@gmail.com>\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"
 "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"
@@ -42,19 +37,26 @@ msgstr "Por favor , proporcione un secreto y una contraseña válida de la app D
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
-#: lib/config.php:423
+#: 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 "<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."
 
-#: lib/config.php:426
+#: 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 "<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."
 
+#: 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 "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de  ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Almacenamiento externo"
@@ -102,7 +104,7 @@ msgstr "Usuarios"
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "Eliiminar"
+msgstr "Eliminar"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 4b1847f27af71f1c39e0667b7af7c7789f455cb2..ee9aef9a9502ad145d5614f030655de17a6f35cd 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Javier Llorente <javier@opensuse.org>, 2012.
-#   <pedro.navia@etecsa.cu>, 2012.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 09:49+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
 "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"
@@ -28,24 +25,24 @@ msgstr "Contraseña"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartió la carpeta %s contigo"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartió el fichero %s contigo"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "No hay vista previa disponible para"
 
-#: templates/public.php:37
+#: 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 1b0f8f70f3633ea94d6ada97bdf709149a9d63ab..4d786a12214c155e942adf96d65af5ae55ee628c 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <sergioballesterossolanas@gmail.com>, 2013.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "No se puede eliminar %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Error"
 
@@ -41,31 +39,31 @@ msgstr "Error"
 msgid "delete file permanently"
 msgstr "Eliminar archivo permanentemente"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} archivos"
 
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 214d638d330571a8fba0aa6c23a0829010fb5c00..89307a3c01eecd6eaf8b1b15156d7808d7674e57 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Javier Llorente <javier@opensuse.org>, 2012.
-#   <juanma@kde.org.ar>, 2012.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#   <sergio@entrecables.com>, 2012.
-# vicente rmz <vicentevrl@hotmail.com>, 2013.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 22:51+0000\n"
-"Last-Translator: vicentevrl <vicentevrl@hotmail.com>\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"
 "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"
@@ -46,11 +40,11 @@ msgstr "fallo"
 msgid "File %s could not be reverted to version %s"
 msgstr "El archivo %s no puede ser revertido a la version %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "No hay versiones antiguas disponibles"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Ruta no especificada"
 
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index eb527ee4d95a8616d4d0cd655d6c7add18e1ba14..ce97db94929ac48f6a35f14911eb693b148d333f 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-#  <juanma@kde.org.ar>, 2013.
-#   <juanma@kde.org.ar>, 2012.
-# Marcos <djoser.horus@gmail.com>, 2013.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
-# Ricardo A. Hermosilla Carrillo <ra.hermosillac@gmail.com>, 2013.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#   <sergio@entrecables.com>, 2012.
+# 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Marcos <djoser.horus@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -25,47 +18,47 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "no pudo ser determinado"
 
@@ -101,10 +94,6 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Especificar la carpeta de datos."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -125,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Usuario y/o contraseña de Oracle no válidos"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "No se pudo establecer la conexión a Oracle"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña de MySQL no válidos"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error BD: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando infractor: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existe."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este usuario de MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existe"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este usuario de MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
@@ -232,7 +225,7 @@ msgstr "hace %d días"
 
 #: template.php:121
 msgid "last month"
-msgstr "este mes"
+msgstr "mes pasado"
 
 #: template.php:122
 #, php-format
@@ -241,25 +234,12 @@ msgstr "Hace %d meses"
 
 #: template.php:123
 msgid "last year"
-msgstr "este año"
+msgstr "año pasado"
 
 #: template.php:124
 msgid "years ago"
 msgstr "hace años"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s está disponible. Obtén <a href=\"%s\">más información</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "actualizado"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "comprobar actualizaciones está desactivado"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 04888a9f08d96a17649477ae4282f293f7114b4e..353d8839be50ad92c627b87fa3d434e5357a0eb7 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,31 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Art O. Pal <artopal@fastmail.fm>, 2012.
-# Daniel Manterola <daniel_manterola@dfml.cl>, 2013.
-#   <davidlopez.david@gmail.com>, 2012.
-# Javier Llorente <javier@opensuse.org>, 2012.
-#  <juanma@kde.org.ar>, 2013.
-#   <juanma@kde.org.ar>, 2011-2012.
-# Marcos <djoser.horus@gmail.com>, 2013.
-#   <monty_2731@hotmail.com>, 2011.
-# oSiNaReF  <>, 2012.
-#  <pedro.navia@etecsa.cu>, 2013.
-#   <pggx999@gmail.com>, 2012.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
-# Ricardo A. Hermosilla Carrillo <ra.hermosillac@gmail.com>, 2013.
-#   <rodrigo.calvo@gmail.com>, 2012.
-#   <rom1dep@gmail.com>, 2011.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#   <sergioballesterossolanas@gmail.com>, 2011-2012.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
+# Art O. Pal <artopal@fastmail.fm>, 2013
+# ggam <ggam@brainleakage.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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -39,14 +24,18 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Su nombre fue cambiado."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr "Incapaz de cambiar el nombre"
+msgstr "No se pudo cambiar el nombre"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -58,11 +47,11 @@ msgstr "No se pudo añadir el grupo"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr "No puedo habilitar la app."
+msgstr "No puedo habilitar la aplicación."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr "Correo guardado"
+msgstr "E-mail guardado"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
@@ -82,7 +71,7 @@ msgstr "Idioma cambiado"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Solicitud no válida"
+msgstr "Petición no válida"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -91,16 +80,16 @@ msgstr "Los administradores no se pueden eliminar a ellos mismos del grupo de ad
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "Imposible añadir el usuario al grupo %s"
+msgstr "No se pudo añadir el usuario al grupo %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "Imposible eliminar al usuario del grupo %s"
+msgstr "No se pudo eliminar al usuario del grupo %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "No se puedo actualizar la aplicacion."
+msgstr "No se pudo actualizar la aplicacion."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -116,7 +105,7 @@ msgstr "Activar"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr "Espere por favor...."
+msgstr "Espere, por favor...."
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -128,58 +117,58 @@ msgstr "Actualizando...."
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr "Error mientras se actualizaba"
+msgstr "Error mientras se actualizaba la aplicación"
 
 #: js/apps.js:96
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "deshacer"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr "No se puede quitar el usuario"
+msgstr "No se puede eliminar el usuario"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
-msgstr "Grupo admin"
+msgstr "Grupo administrador"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
-msgstr "Añadir Grupo"
+msgstr "añadir Grupo"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
-msgstr "Se debe usar un nombre de usuario  valido"
+msgstr "Se debe usar un nombre de usuario  válido"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Error al crear usuario"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Se debe usar una contraseña valida"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -194,11 +183,11 @@ 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 "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web."
+msgstr "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Le recomendamos encarecidamente que configure su servidor web de manera que el directorio de datos no esté accesible, o mueva el directorio de datos fuera del documento raíz de su servidor web."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr "Advertencia de Configuración"
+msgstr "Advertencia de configuración"
 
 #: templates/admin.php:32
 msgid ""
@@ -219,11 +208,11 @@ msgstr "Modulo 'fileinfo' perdido"
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "El modulo PHP 'fileinfo' no se encuentra. Sugerimos habilitar este modulo para tener mejorres resultados con la detección mime-type"
+msgstr "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type"
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr "Configuración regional no está funcionando"
+msgstr "La configuración regional no está funcionando"
 
 #: templates/admin.php:63
 #, php-format
@@ -231,7 +220,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 "Este servidor ownCloud no puede establecer la configuración regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar %s."
+msgstr "Este servidor ownCloud no puede establecer la configuración regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar el %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -245,7 +234,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 "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como montar almacenamiento externo, notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionaran. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a internet para este servidor si quiere tener todas las caracteristicas de ownCloud."
+msgstr "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionarán. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a Internet para este servidor si quiere disfrutar de todas las características de ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -259,13 +248,13 @@ msgstr "Ejecutar una tarea con cada página cargada"
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr "cron.php es un sistema webcron registrado. Llame a la página cron.php en la raíz de owncloud una vez por minuto sobre http."
+msgstr "cron.php es un sistema webcron registrado. Llama a la página cron.php en la raíz de owncloud una vez por minuto sobre http."
 
 #: 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 "Utilizar el servicio cron del sistema. Llame al archivo cron.php en la carpeta de owncloud a través de un cronjob del sistema una vez por minuto."
+msgstr "Utilizar el servicio cron del sistema. Llama al archivo cron.php en la carpeta de owncloud a través de un cronjob del sistema una vez por minuto."
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -297,7 +286,7 @@ msgstr "Permitir a los usuarios compartir elementos ya compartidos con ellos mis
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr "Permitir a los usuarios compartir con todos"
+msgstr "Permitir a los usuarios compartir con todo el mundo"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
@@ -314,7 +303,7 @@ msgstr "Forzar HTTPS"
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr "Forzar la conexión de los clientes a ownCloud con una conexión encriptada."
+msgstr "Fuerza la conexión de los clientes a ownCloud con una conexión cifrada."
 
 #: templates/admin.php:185
 msgid ""
@@ -324,25 +313,25 @@ msgstr "Por favor, conecte esta instancia de ownCloud vía HTTPS para activar o
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr "Historial"
+msgstr "Registro"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr "Nivel de Historial"
+msgstr "Nivel de registro"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
-msgstr "Version"
+msgstr "Versión"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -378,11 +367,11 @@ msgstr "Actualizar"
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr "Documentación del usuario"
+msgstr "Documentación de usuario"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr "Documentación del adminsitrador"
+msgstr "Documentación de adminstrador"
 
 #: templates/help.php:9
 msgid "Online Documentation"
@@ -394,26 +383,26 @@ msgstr "Foro"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr "Rastreador de Bugs"
+msgstr "Rastreador de fallos"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "Soporte Comercial"
+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 <strong>%s</strong> disponibles"
+msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr "Obtener las apps para sincronizar sus archivos"
+msgstr "Obtener las aplicaciones para sincronizar sus archivos"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Mostrar asistente para iniciar otra vez"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Contraseña"
 
@@ -423,7 +412,7 @@ msgstr "Su contraseña ha sido cambiada"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "No se ha podido cambiar tu contraseña"
+msgstr "No se ha podido cambiar su contraseña"
 
 #: templates/personal.php:40
 msgid "Current password"
@@ -431,88 +420,80 @@ msgstr "Contraseña actual"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "Nueva contraseña:"
+msgstr "Nueva contraseña"
 
 #: templates/personal.php:44
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Su nombre fue cambiado"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Incapaz de cambiar su nombre"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Cambiar nombre"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Correo electrónico"
+msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
-msgstr "Tu dirección de correo"
+msgstr "Su dirección de correo"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
-msgstr "Escribe una dirección de correo electrónico para restablecer la contraseña"
+msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
-msgstr "Ayúdanos a traducir"
+msgstr "Ayúdnos a traducir"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperación de la contraseña de administración"
+
+#: templates/users.php:38
 msgid "Default Storage"
-msgstr "Almacenamiento Predeterminado"
+msgstr "Almacenamiento predeterminado"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
-msgstr "Alamacenamiento"
+msgstr "Almacenamiento"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "Cambiar nombre a mostrar"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "Configurar nueva contraseña"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 998243e1cf7318a2eafb9fa7247aa2ba526c40dd..5842c6f8db8bc729d2af2f9fad2874244f88d7da 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -3,21 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Felix Liberio <felix.liberio@gmail.com>, 2013.
-# Javier Llorente <javier@opensuse.org>, 2012.
-#   <juanma@kde.org.ar>, 2012.
-#   <manudeloz86@gmail.com>, 2012.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012-2013.
-# Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#   <sergioballesterossolanas@gmail.com>, 2012.
-# Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# ordenet <roberto@ordenet.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -25,6 +20,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Ocurrió un fallo al borrar las asignaciones."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "No se pudo borrar la configuración del servidor"
@@ -51,7 +50,7 @@ msgstr "Falló el borrado"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr "Hacerse cargo de los ajustes de configuración del servidor reciente?"
+msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
@@ -61,281 +60,363 @@ msgstr "Mantener la configuración?"
 msgid "Cannot add server configuration"
 msgstr "No se puede añadir la configuración del servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Asignaciones borradas"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Éxito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "La prueba de conexión fue exitosa"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "La prueba de conexión falló"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar eliminación"
 
-#: templates/settings.php:8
+#: 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 "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
+msgstr "<b>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
 
-#: templates/settings.php:11
+#: 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 "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Agregar configuracion del servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN Base por línea"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:45
+#: 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 "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:53
+#: 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 "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
+msgstr "usar %%uid como comodín, ej: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Sin placeholder, ej: \"objectClass=person\"."
+msgstr "Sin comodines, ej: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
+msgstr "sin comodines, ej: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr "Configuracion de coneccion"
+msgstr "Configuración de conexión"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuracion activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Cuando deseleccione, esta configuracion sera omitida."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr "Host para backup (Replica)"
+msgstr "Servidor de copia de seguridad (Replica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
+msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr "Puerto para backup (Replica)"
+msgstr "Puerto para copias de seguridad (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deshabilitar servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
+msgstr "Cuando se inicie, ownCloud unicamente conectará al servidor replica"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
+msgstr "No lo use para conexiones LDAPS, Fallará."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
+msgstr "Servidor de LDAP no sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validación por certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache TTL"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
-msgstr "en segundos. Un cambio vacía la cache."
+msgstr "en segundos. Un cambio vacía la caché."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Configuracion de directorio"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN Base de Usuario por línea"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de la busqueda de usuario"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN Base de Grupo por línea"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de busqueda de grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nombre de usuario interno"
+
+#: 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 "Por defecto el nombre de usuario interno será creado desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En 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 quitados. En coincidencias un número será añadido o incrementado. El nombre de usuario interno es usado para identificar un usuario internamente. Es también el nombre por defecto para la carpeta 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 a como era antes de ownCloud 5, introduce el atributo del nombre en pantalla del usuario en el siguiente campo. Déjalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo Nombre de usuario Interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Sobrescribir la detección UUID"
+
+#: 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 "Por defecto, ownCloud autodetecta el atributo UUID. El atributo UUID es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los nuevos usuarios y grupos de LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Asignación del Nombre de usuario de un usuario LDAP"
+
+#: 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 "ownCloud utiliza 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é más bien 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. Eliminando las asignaciones tendrá restos por todas partes. Eliminando las asignaciones no es sensible a la configuración, que afecta a todas las configuraciones de LDAP! No limpiar 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 "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Configuración de prueba"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index c3d87548a9b53165674a81a7c23b9b836d71bbac..9b520ddeaaebbe418cc0a94fb127fa7967659a25 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-# Art O. Pal <artopal@fastmail.fm>, 2012.
-#   <pggx999@gmail.com>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2012
+# pggx999 <pggx999@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-21 00:04+0100\n"
-"PO-Revision-Date: 2013-01-20 02:31+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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"
 "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"
@@ -28,7 +28,7 @@ msgstr "Autenticación de WevDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 472db3180b336949ec5135bda4821b59ac50613c..d277c3e3a8cd3c53c1b03a4bbbca1f4934c8bb9a 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012-2013.
-#   <javierkaiser@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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: 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"
@@ -76,7 +73,7 @@ msgstr "Error al agregar %s a favoritos. "
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "No hay categorías seleccionadas para borrar."
+msgstr "No se seleccionaron categorías para borrar."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -113,125 +110,129 @@ msgstr "Sábado"
 
 #: js/config.php:45
 msgid "January"
-msgstr "Enero"
+msgstr "enero"
 
 #: js/config.php:46
 msgid "February"
-msgstr "Febrero"
+msgstr "febrero"
 
 #: js/config.php:47
 msgid "March"
-msgstr "Marzo"
+msgstr "marzo"
 
 #: js/config.php:48
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 
 #: js/config.php:49
 msgid "May"
-msgstr "Mayo"
+msgstr "mayo"
 
 #: js/config.php:50
 msgid "June"
-msgstr "Junio"
+msgstr "junio"
 
 #: js/config.php:51
 msgid "July"
-msgstr "Julio"
+msgstr "julio"
 
 #: js/config.php:52
 msgid "August"
-msgstr "Agosto"
+msgstr "agosto"
 
 #: js/config.php:53
 msgid "September"
-msgstr "Septiembre"
+msgstr "septiembre"
 
 #: js/config.php:54
 msgid "October"
-msgstr "Octubre"
+msgstr "octubre"
 
 #: js/config.php:55
 msgid "November"
-msgstr "Noviembre"
+msgstr "noviembre"
 
 #: js/config.php:56
 msgid "December"
-msgstr "Diciembre"
+msgstr "diciembre"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Ajustes"
+msgstr "Configuración"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "Hace 1 hora"
+msgstr "1 hora atrás"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrás"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "hace {days} días"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "años atrás"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Elegir"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "No"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -296,7 +297,7 @@ msgstr "Compartir con link"
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contraseña"
 
@@ -334,7 +335,7 @@ msgstr "Compartido en {item} con {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Remover compartir"
+msgstr "Dejar de compartir"
 
 #: js/share.js:320
 msgid "can edit"
@@ -399,24 +400,27 @@ msgstr "Restablecer contraseña de ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usá este enlace para restablecer tu contraseña: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña"
+#: 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:5
-msgid "Reset email send."
-msgstr "Reiniciar envío de email."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Error en el pedido!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
@@ -430,7 +434,7 @@ msgstr "A la página de inicio de sesión"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Nueva contraseña"
+msgstr "Nueva contraseña:"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -450,7 +454,7 @@ msgstr "Aplicaciones"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrador"
+msgstr "Administración"
 
 #: strings.php:9
 msgid "Help"
@@ -522,75 +526,80 @@ msgstr "Avanzado"
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "se utilizarán"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "servicios web sobre los que tenés control"
+msgstr "servicios web controlados por vos"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "¡El inicio de sesión automático fue rechazado!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "¿Perdiste tu contraseña?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "recordame"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index acdb08fc755ed084dc48ea7848f3d627b353df7b..dd55de5889c9c291e55f077c1871e58927b8d649 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012-2013.
-# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,17 +28,13 @@ msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
 msgid "Could not move %s"
 msgstr "No se pudo mover %s "
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "No fue posible cambiar el nombre al archivo"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "El archivo no fue subido. Error desconocido"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "No se han producido errores, el archivo se ha subido con éxito"
+msgstr "No hay errores, el archivo fue subido con éxito"
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,19 +45,19 @@ msgstr "El archivo que intentás subir excede el tamaño definido por upload_max
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "El archivo que intentás subir sobrepasa el tamaño definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
+msgstr "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "El archivo que intentás subir solo se subió parcialmente"
+msgstr "El archivo fue subido parcialmente"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "El archivo no fue subido"
+msgstr "No se subió ningún archivo "
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Falta un directorio temporal"
+msgstr "Error en la carpera temporal"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -82,57 +75,61 @@ msgstr "Directorio invalido."
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Borrar de manera permanente"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Borrar"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pendiente"
+msgstr "Pendientes"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Eliminar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "Subiendo archivos"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -156,69 +153,77 @@ msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualiz
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No fue posible subir el archivo porque es un directorio o porque su tamaño es 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "No hay suficiente espacio disponible"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacía"
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} archivos"
 
+#: lib/app.php:53
+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"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "No fue posible cambiar el nombre al archivo"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Subir"
@@ -279,37 +284,37 @@ msgstr "Archivos Borrados"
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "No tenés permisos de escritura acá."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "El archivo es demasiado grande"
+msgstr "El tamaño del archivo que querés subir es demasiado grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo "
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Escaneo actual"
 
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index be26d5b095f5445f8de2e27d9d62bd4567540af0..0fd32631ce919c5d3c548ee97235a9dbd4c5d738 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 00:20+0100\n"
-"PO-Revision-Date: 2013-02-11 16:00+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "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,22 +17,87 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La encriptación de archivos no está habilitada"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Los siguientes tipos de archivos no serán encriptados"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir los siguientes tipos de archivos de encriptación:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ninguno"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index fe89f32163a016d0c69a79ba7756a487f263d43b..10c00b1fd936715bbc08cbe9f8466793616e83ad 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
-#   <claudio.tessone@gmail.com>, 2012.
-# Julia <juliassantos5@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: juliabis <juliassantos5@gmail.com>\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"
 "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"
@@ -40,19 +37,26 @@ msgstr "Por favor, proporcioná un secreto y una contraseña válida para la apl
 msgid "Error configuring Google Drive storage"
 msgstr "Error al configurar el almacenamiento de Google Drive"
 
-#: lib/config.php:423
+#: 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 "<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."
 
-#: lib/config.php:426
+#: 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 "<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."
 
+#: 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 "Almacenamiento externo"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 62233486fb0d792d78b73bc8d122c167d8e1b31d..e1fb66bf96dacc6ee2d8a35668a54d890c75b659 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 04:38+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Contraseña"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartió la carpeta %s con vos"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartió el archivo %s con vos"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "La vista preliminar no está disponible para"
 
-#: templates/public.php:37
+#: 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 6fd3a47fca7322afe38a95d318505bc4c140813c..0be5f1364f52c73d2f4730cd00d51933579580a4 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/files_trashbin.po
@@ -3,13 +3,12 @@
 # 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "No fue posible borrar %s de manera permanente"
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "Restaurar"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Error"
 
@@ -40,31 +39,31 @@ msgstr "Error"
 msgid "delete file permanently"
 msgstr "Borrar archivo de manera permanente"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Borrar de manera permanente"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Borrado"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} archivos"
 
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index db63d14a041af12ef8ad5ad95450d340e97880bd..956dd59f216fabc314499840f2720389fcf049f9 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012.
-# Julia <juliassantos5@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 00:50+0000\n"
-"Last-Translator: juliabis <juliassantos5@gmail.com>\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"
 "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"
@@ -43,11 +40,11 @@ msgstr "error"
 msgid "File %s could not be reverted to version %s"
 msgstr "El archivo %s no pudo ser revertido a la versión %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "No hay versiones antiguas disponibles"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Ruta de acceso no especificada"
 
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 8284b524c1af9de4e7aaf7a832d0f24702a2033c..901682d858ed3072df16cbeef9375e454e0e4668 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012.
-# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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: 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"
@@ -21,47 +17,47 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
-msgstr "Ajustes"
+msgstr "Configuración"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Volver a archivos"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "no pudo ser determinado"
 
@@ -71,7 +67,7 @@ msgstr "La aplicación no está habilitada"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Error de autenticación"
+msgstr "Error al autenticar"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -97,10 +93,6 @@ msgstr "Configurar un nombre de administrador"
 msgid "Set an admin password."
 msgstr "Configurar una palabra clave de administrador"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Especificar un directorio de datos"
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,79 +113,83 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 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:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "El nombre de usuario y contraseña no son válidos"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña MySQL no válido"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "El comando no comprendido es: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existente"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existente"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, 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:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "hace unos segundos"
+msgstr "segundos atrás"
 
 #: template.php:114
 msgid "1 minute ago"
@@ -228,7 +224,7 @@ msgstr "hace %d días"
 
 #: template.php:121
 msgid "last month"
-msgstr "este mes"
+msgstr "el mes pasado"
 
 #: template.php:122
 #, php-format
@@ -237,24 +233,11 @@ msgstr "%d meses atrás"
 
 #: template.php:123
 msgid "last year"
-msgstr "este año"
+msgstr "el año pasado"
 
 #: template.php:124
 msgid "years ago"
-msgstr "hace años"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s está disponible. Conseguí <a href=\"%s\">más información</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "actualizado"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "comprobar actualizaciones está desactivado"
+msgstr "años atrás"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index a23143a63b81183ace78119e16f299e3fdc62ff9..61bfae4d5fd2221b96046affbbb1bab33d111444 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012.
-# Javier Victor Mariano Bruno <koryyyy@gmail.com>, 2013.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error al autenticar"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "El nombre mostrado fue cambiado"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "No fue posible cambiar el nombre mostrado"
 
@@ -68,7 +69,7 @@ msgstr "Idioma cambiado"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Solicitud no válida"
+msgstr "Pedido no válido"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -120,52 +121,52 @@ msgstr "Error al actualizar"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "deshacer"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Imposible remover usuario"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Borrar"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "Agregar grupo"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Debe ingresar un nombre de usuario válido"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Error creando usuario"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -316,19 +317,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +400,7 @@ msgstr "Obtené aplicaciones para sincronizar tus archivos"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Contraseña"
 
@@ -423,82 +424,74 @@ msgstr "Nueva contraseña:"
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "El nombre mostrado fue cambiado"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "No fue posible cambiar tu nombre"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Cambiar nombre"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Correo electrónico"
+msgstr "Correo Electrónico"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nombre de "
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Almacenamiento Predeterminado"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "Otro"
+msgstr "Otros"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "Cambiar el nombre que se muestra"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "Configurar nueva contraseña"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 69b9d37f70c6f5d8de4f32a803abcf6a4a48cd87..3155fed37457ac6edcedaa21e5bd144eb97d5518 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "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"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Fallo al borrar la configuración del servidor"
@@ -56,281 +57,363 @@ msgstr "¿Mantener preferencias?"
 msgid "Cannot add server configuration"
 msgstr "No se pudo añadir la configuración del servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Éxito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "El este de conexión ha sido completado satisfactoriamente"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Falló es test de conexión"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea borrar la configuración actual del servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar borrado"
 
-#: templates/settings.php:8
+#: 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 "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
 
-#: templates/settings.php:11
+#: 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 "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Añadir Configuración del Servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Una DN base por línea"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:45
+#: 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 "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:53
+#: 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 "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar cuando se obtienen grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Configuración de Conección"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Si no está seleccionada, esta configuración será omitida."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host para copia de seguridad (réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Puerto para copia de seguridad (réplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deshabilitar el Servidor Principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Al comenzar, ownCloud se conectará únicamente al servidor réplica"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validación por certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tiempo de vida del caché"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Cambiarlo vacía la cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Configuración de Directorio"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Una DN base de usuario por línea"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de la búsqueda de usuario"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Una DN base de grupo por línea"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de búsqueda de grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de cuota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de e-mail"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regla de nombre de los directorios de usuario"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: 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 "Probar configuración"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 6c88cac3fd09f92601d83b3db46ade2f069eea27..752a64616bb247cd971e3cb56a589e28b0bcff1a 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
-# CJTess <claudio.tessone@gmail.com>, 2013.
-#   <claudio.tessone@gmail.com>, 2012.
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012
+# cjtess <claudio.tessone@gmail.com>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 16:22+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "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"
@@ -28,7 +28,7 @@ msgstr "Autenticación de WevDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 4265067672b9a90993b4bee1ccaa058565ee6aac..2394ba43d66744ad28bffb08a850807b65c6fa2a 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2011-2012.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 09:40+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,26 +22,26 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Kasutaja %s jagas Sinuga faili"
+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 kataloogi."
+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"
+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 kataloogi \"%s\". See on allalaadimiseks saadaval siin: %s"
+msgstr "Kasutaja %s jagas sinuga kausta \"%s\". See on allalaadimiseks saadaval siin: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -54,7 +54,7 @@ msgstr "Pole kategooriat, mida lisada?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "See kategooria juba eksisteerib: %s"
+msgstr "See kategooria on juba olemas: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -66,7 +66,7 @@ msgstr "Objekti tüüb puudub."
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID puudub"
+msgstr "%s ID puudub."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
@@ -80,7 +80,7 @@ msgstr "Kustutamiseks pole kategooriat valitud."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Viga %s eemaldamisel lemmikutest"
+msgstr "Viga %s eemaldamisel lemmikutest."
 
 #: js/config.php:34
 msgid "Sunday"
@@ -162,82 +162,86 @@ msgstr "Detsember"
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 tund tagasi"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} tundi tagasi"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} päeva tagasi"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} kuud tagasi"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "aastat tagasi"
 
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Vali"
 
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Loobu"
 
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Vali"
+#: 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:215
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Jah"
 
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ei"
 
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr "Ok"
+
 #: 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 "Objekti tüüb pole määratletud"
+msgstr "Objekti tüüp pole määratletud."
 
 #: 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
@@ -249,7 +253,7 @@ msgstr "Viga"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "Rakenduse nimi ole määratletud"
+msgstr "Rakenduse nimi ole määratletud."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -295,13 +299,13 @@ msgstr "Jaga lingiga"
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parool"
 
 #: js/share.js:173
 msgid "Email link to person"
-msgstr "Saada link isikule emailiga"
+msgstr "Saada link isikule e-postiga"
 
 #: js/share.js:174
 msgid "Send"
@@ -373,11 +377,11 @@ msgstr "Viga aegumise kuupäeva määramisel"
 
 #: js/share.js:604
 msgid "Sending ..."
-msgstr "Saadan ..."
+msgstr "Saatmine ..."
 
 #: js/share.js:615
 msgid "Email sent"
-msgstr "Email saadetud"
+msgstr "E-kiri on saadetud"
 
 #: js/update.js:14
 msgid ""
@@ -398,24 +402,27 @@ msgstr "ownCloud parooli taastamine"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
+#: 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 "Link parooli vahetuseks on saadetud Sinu e-posti aadressile.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge.<br>Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Taastamise e-kiri on saadetud."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õiged?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Päring ebaõnnestus!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Päringu taastamine"
 
@@ -437,7 +444,7 @@ msgstr "Nulli parool"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "isiklik"
+msgstr "Isiklik"
 
 #: strings.php:6
 msgid "Users"
@@ -445,7 +452,7 @@ msgstr "Kasutajad"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Programmid"
+msgstr "Rakendused"
 
 #: strings.php:8
 msgid "Admin"
@@ -507,7 +514,7 @@ 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 "Serveri korrektseks seadistuseks palun tutvu <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>."
+msgstr "Serveri korrektseks seadistuseks tutvu palun <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentatsiooniga</a>."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -515,43 +522,43 @@ msgstr "Loo <strong>admini konto</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "Lisavalikud"
+msgstr "Täpsem"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "kasutatakse"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Andmebaasi tabeliruum"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
@@ -559,39 +566,44 @@ msgstr "Lõpeta seadistamine"
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Logi välja"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automaatne sisselogimine lükati tagasi!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Kui sa ei muutnud oma parooli hiljut, siis võib su kasutajakonto olla ohustatud!"
+msgstr "Kui sa ei muutnud oma parooli hiljuti, siis võib su kasutajakonto olla ohustatud!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Palun muuda parooli, et oma kasutajakonto uuesti turvata."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "pea meeles"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
-msgstr "Alternatiivsed meldimised"
+msgstr "Alternatiivsed sisselogimisviisid"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -604,4 +616,4 @@ msgstr "järgm"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Uuendan ownCloudi versioonile %s. Läheb pisut aega."
+msgstr "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 72fabba27316571b06b15e340ec05591fa9ee1e9..50518ecb5a765d24e242bf509f9fb2d3415ac9df 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dagor.vint@hotmail.com>, 2012.
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2011-2013.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 09:20+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
 "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"
@@ -30,28 +29,24 @@ msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
 msgid "Could not move %s"
 msgstr "%s liigutamine ebaõnnestus"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Faili ümbernimetamine ebaõnnestus"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Ühtegi viga pole, fail on üles laetud"
+msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse"
+msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:"
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Üles laetud faili suurus ületab HTML vormis määratud upload_max_filesize suuruse"
+msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -81,57 +76,61 @@ msgstr "Vigane kaust."
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Jaga"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
-msgstr "ümber"
+msgstr "Nimeta ümber"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "teosta kustutamine"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "1 faili üleslaadimisel"
+msgstr "1 fail üleslaadimisel"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr "failide üleslaadimine"
+msgstr "faili üleslaadimisel"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -149,75 +148,83 @@ msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatu
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Sinu andmemaht on täis! Faile ei uuendata ja sünkroniseerimist ei toimu!"
+msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega kui on tegu suurte failidega. "
+msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
+msgstr "Faili ei saa üles laadida, kuna see on kaust või selle suurus on 0 baiti"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Pole piisavalt ruumi"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise."
+msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tühi."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Viga"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} faili"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Vigane kausta nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Faili ümbernimetamine ebaõnnestus"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Lae üles"
@@ -278,40 +285,40 @@ msgstr "Kustutatud failid"
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr "Siin puudvad Sul kirjutamisõigused."
+msgstr "Siin puudvad sul kirjutamisõigused."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ãœleslaadimine on liiga suur"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Faile skannitakse, palun oota"
+msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Praegune skannimine"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Uuendan failisüsteemi puhvrit..."
+msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index c2fe900d3ac6bf9eb3b9d8b078be582246065a9a..2bcdd23d94336006fee3f5e578d7221873f695eb 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 18:01+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
 "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"
@@ -18,22 +19,87 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Taastevõtme lubamine õnnestus"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Taastevõtme keelamine õnnestus"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Parool edukalt vahetatud."
+
+#: ajax/changeRecoveryPassword.php:51
+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."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Salvestamine..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Faili krüpteerimine on sisse lülitatud."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Konto taasteparool"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Sisse lülitatud"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr "Konto vana taaste parool"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Konto uus taasteparool"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Järgnevaid failitüüpe ei krüpteerita:"
+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"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Järgnevaid failitüüpe ei krüpteerita:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Faili taaste seaded uuendatud"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Pole"
+#: templates/settings-personal.php:28
+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 f9116417c5aca006795aff4772de041875bdb008..0cf16cec04e745e51bb272e6c796b3159aa6e53b 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2012.
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 09:50+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
 "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"
@@ -39,18 +38,25 @@ msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
 msgid "Error configuring Google Drive storage"
 msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 
-#: lib/config.php:424
+#: 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 "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi."
 
-#: lib/config.php:427
+#: 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 "<b>Hoiatus:</b> FTP tugi puudub PHP paigalduses. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
+msgstr "<b>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
+
+#: 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 "<b>Hoiatus:</b> PHP-s puudub Curl tugi. Jagatud ownCloud / WebDAV või GoogleDrive ühendamine pole võimalik. Palu oma süsteemihalduril see paigaldada."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index c0302f73c0695ae76080e335801022aa77ce5aff..f1913930b3a322affba61f97c3ca76875bb925f4 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-30 00:01+0100\n"
-"PO-Revision-Date: 2012-10-29 22:43+0000\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -26,24 +25,24 @@ msgstr "Parool"
 msgid "Submit"
 msgstr "Saada"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jagas sinuga kausta %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jagas sinuga faili %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Eelvaadet pole saadaval"
 
-#: templates/public.php:35
+#: 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 5c61192eb5b72350f2d2343debba2aacad18f837..9341e71a33f77a4428d56d1efd3f12793d72c66b 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/files_trashbin.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 07:00+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
 "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"
@@ -29,11 +27,11 @@ msgstr "%s jäädavalt kustutamine ebaõnnestus"
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "soorita taastamine"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Viga"
 
@@ -41,31 +39,31 @@ msgstr "Viga"
 msgid "delete file permanently"
 msgstr "kustuta fail jäädavalt"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} faili"
 
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index ffd4dc68f79e3741552dd34ab767b3a03e595612..6be6fc45ff4528470a63258c450caefcfae208d4 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 10:10+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,4 +55,4 @@ msgstr "Versioonid"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Taasta fail varasemale versioonile klikkides \"Revert\" nupule"
+msgstr "Taasta fail varasemale versioonile klikkides nupule \"Taasta\""
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index bc7497c4eded414192130eca44e698ba6927a537..fa2c3de3fcf01090bc6d1f88d26d20bdfcd8a82b 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 10:00+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:33+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,49 +19,49 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
-msgstr "Ei suuda tuvastada"
+msgstr "ei suudetud tuvastada"
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -95,14 +95,10 @@ msgstr "Määra admin kasutajanimi."
 msgid "Set an admin password."
 msgstr "Määra admini parool."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Määra andmete kaust."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr "%s sisesta andmebaasi kasutajatunnus"
+msgstr "%s sisesta andmebaasi kasutajatunnus."
 
 #: setup.php:58
 #, php-format
@@ -119,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Ei suuda luua ühendust Oracle baasiga"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Andmebaasi viga: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Tõrkuv käsk oli: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Kustuta see kasutaja MySQL-ist"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Kustuta see kasutaja MySQL-ist."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
@@ -226,7 +226,7 @@ msgstr "%d päeva tagasi"
 
 #: template.php:121
 msgid "last month"
-msgstr "eelmisel kuul"
+msgstr "viimasel kuul"
 
 #: template.php:122
 #, php-format
@@ -235,25 +235,12 @@ msgstr "%d kuud tagasi"
 
 #: template.php:123
 msgid "last year"
-msgstr "eelmisel aastal"
+msgstr "viimasel aastal"
 
 #: template.php:124
 msgid "years ago"
 msgstr "aastat tagasi"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ajakohane"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "uuenduste kontrollimine on välja lülitatud"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 0ea6c62c2b7d3e4fbba0f1b7065660e19afc83f8..aa4192988acf9aba648fae8c6daa72a6bfb87e06 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <icewind1991@gmail.com>, 2012.
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2011-2013.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 09:00+0000\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,16 +21,20 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
+msgstr "App Store'i nimekirja laadimine ebaõnnestus"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentimise viga"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Sinu näidatav nimi on muudetud."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr "Ei saa muuta kuvatavat nime"
+msgstr "Ei saa muuta näidatavat nime"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -55,11 +58,11 @@ msgstr "Vigane e-post"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "Keela grupi kustutamine"
+msgstr "Grupi kustutamine ebaõnnestus"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr "Keela kasutaja kustutamine"
+msgstr "Kasutaja kustutamine ebaõnnestus"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -119,52 +122,52 @@ msgstr "Viga rakenduse uuendamisel"
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Salvestamine..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "kustutatud"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "tagasi"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr "Ei suuda kustutada kasutajat"
+msgstr "Kasutaja eemaldamine ebaõnnestus"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupid"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupi admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "lisa grupp"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Sisesta nõuetele vastav kasutajatunnus"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Viga kasutaja loomisel"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Sisesta nõuetele vastav parool"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -315,19 +318,19 @@ msgstr "Logi"
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -383,7 +386,7 @@ msgstr "Vigade nimekiri"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "Tasuine kasutajatugi"
+msgstr "Tasuline kasutajatugi"
 
 #: templates/personal.php:8
 #, php-format
@@ -398,7 +401,7 @@ msgstr "Hangi rakendusi failide sünkroniseerimiseks"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Parool"
 
@@ -422,82 +425,74 @@ msgstr "Uus parool"
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Sinu kuvatav nimi muutus"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Ei suuda muuta kuvatavat nime"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Muuda näidatavat nime"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Kasutajanimi"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Lisa"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Admin taasteparool"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Vaikimisi maht"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Piiramatult"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Maht"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "muuda näidatavat nime"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "määra uus parool"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 8cd40564508b149fb1011a9475dfd12aaff86d3a..aaf1de90aefeceb307a83621ad391dee080c0a27 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2012.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 08:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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,6 +19,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Vastendususte puhastamine ebaõnnestus."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Serveri seadistuse kustutamine ebaõnnestus"
@@ -49,287 +53,369 @@ msgstr "Võta sätted viimasest serveri seadistusest?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "Säilitada seadistus?"
+msgstr "Säilitada seadistused?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
 msgstr "Ei suuda lisada serveri seadistust"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "vastendused puhastatud"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Korras"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Viga"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr "Test ühendus õnnestus"
+msgstr "Ühenduse testimine õnnestus"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr "Test ühendus ebaõnnestus"
+msgstr "Ühenduse testimine ebaõnnestus"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Kinnita kustutamine"
 
-#: templates/settings.php:8
+#: 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 "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada."
 
-#: templates/settings.php:11
+#: 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 "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serveri seadistus"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Lisa serveri seadistus"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Baas DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Ãœks baas-DN rea kohta"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Kasutaja DN"
 
-#: templates/settings.php:45
+#: 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 "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parool"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Kasutajanime filter"
 
-#: templates/settings.php:53
+#: 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 "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kasutajate nimekirja filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupi filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Ãœhenduse seaded"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Seadistus aktiivne"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Kui märkimata, siis seadistust ei kasutata"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Varuserver"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr "Varuserveri (replika) ldap port"
+msgstr "Varuserveri (replika) port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Ära kasuta peaserverit"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Märgituna ownCloud ühendub ainult varuserverisse."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr "Kasutaja TLS"
+msgstr "Kasuta TLS-i"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS puhul ära kasuta. Ühendus ei toimi."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Mittetõstutundlik LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Lülita SSL sertifikaadi kontrollimine välja."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Pole soovitatav, kasuta ainult testimiseks."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Puhvri iga"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekundites. Muudatus tühjendab vahemälu."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Kataloogi seaded"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Kasutaja näidatava nime väli"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Ãœks kasutajate baas-DN rea kohta"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Kasutaja otsingu atribuudid"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Valikuline; üks atribuut rea kohta"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grupi näidatava nime väli"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Ãœks grupi baas-DN rea kohta"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupi otsingu atribuudid"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Spetsiifilised atribuudid"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Mahupiirangu atribuut"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Vaikimisi mahupiirang"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Email atribuut"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Kasutaja kodukataloogi nimetamise reegel"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Sisemine kasutajanimi"
+
+#: 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 "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URL pordiks, näiteks kõikidel *DAV teenustel.Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Sisemise kasutajatunnuse atribuut:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Tühista UUID tuvastus"
+
+#: 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 "Vaikimis ownCloud tuvastab automaatlselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi LDAP kasutajate vastendusi (lisatud)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID atribuut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
+
+#: 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 "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, iga LDAP kasutaja peab omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Testi seadistust"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Abiinfo"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index a08c908b9654993f8f4052d915b9081122725500..ee2a1e41f432586905c1529ff99d03e54240d4c0 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pisike Sipelgas <pisike.sipelgas@gmail.com>, 2013.
-# Rivo Zängov <eraser@eraser.ee>, 2012-2013.
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 10:00+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\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"
 "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"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 73e1ca7808266b2592a54bdfb65ac8456a3cb9e5..865871de00ff878fc176540b734fff7c2a7b59d7 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
-# Asier Urio Larrea <asieriko@gmail.com>, 2011.
-# Piarres Beobide <pi@beobide.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -164,75 +160,79 @@ msgstr "Abendua"
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "orain dela {minutes} minutu"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "orain dela {hours} ordu"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "orain dela {days} egun"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "orain dela {months} hilabete"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "urte"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Aukeratu"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ez"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Bai"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ez"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ados"
 
@@ -297,7 +297,7 @@ msgstr "Elkarbanatu lotura batekin"
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -400,24 +400,27 @@ msgstr "ownCloud-en pasahitza berrezarri"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
+#: 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:5
-msgid "Reset email send."
-msgstr "Berrezartzeko eposta bidali da."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Eskariak huts egin du!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Eskaera berrezarri da"
 
@@ -451,7 +454,7 @@ msgstr "Aplikazioak"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Kudeatzailea"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -523,37 +526,37 @@ msgstr "Aurreratua"
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "erabiliko da"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
@@ -561,37 +564,42 @@ msgstr "Bukatu konfigurazioa"
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Saioa bukatu"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Saio hasiera automatikoa ez onartuta!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Mesedez aldatu zure pasahitza zure kontua berriz segurtatzeko."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "gogoratu"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Hasi saioa"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 0e57abc01a925de05c249387169f1b66b35874d0..78cba47346eca827e8f59c81cf8d45a9e7a7cfac 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
-# Asier Urio Larrea <asieriko@gmail.com>, 2011.
-# Piarres Beobide <pi@beobide.net>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -31,17 +27,13 @@ msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
 msgid "Could not move %s"
 msgstr "Ezin dira fitxategiak mugitu %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Ezin izan da fitxategia berrizendatu"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Ez da arazorik izan, fitxategia ongi igo da"
+msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,11 +44,11 @@ msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize m
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
+msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
+msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -64,7 +56,7 @@ msgstr "Ez da fitxategirik igo"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Aldi baterako karpeta falta da"
+msgstr "Aldi bateko karpeta falta da"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -82,57 +74,61 @@ msgstr "Baliogabeko karpeta."
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Elkarbanatu"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Ezabatu"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "fitxategiak igotzen"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -156,69 +152,77 @@ msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
+msgstr "Ezin izan da zure fitxategia igo karpeta bat delako edo 0 byte dituelako"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ez dago leku nahikorik."
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Errorea"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
+#: 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 "Ezin izan da fitxategia berrizendatu"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Igo"
@@ -279,37 +283,37 @@ msgstr "Ezabatutako fitxategiak"
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Ez duzu hemen idazteko baimenik."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Igotakoa handiegia da"
+msgstr "Igoera handiegia da"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
 
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index d62efe1ac98cc7be7d0ec919e80bdee0191fb145..1e367b1e9c5d1643b5d205df606663232a557537 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-13 00:03+0100\n"
-"PO-Revision-Date: 2013-02-12 22:00+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gordetzen..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fitxategien enkriptazioa gaituta dago."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Hurrengo fitxategi motak ez dira enkriptatuko:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Baztertu hurrengo fitxategi motak enkriptatzetik:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Bat ere ez"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 3f3d36daefcce1f77878741d5678ca3f7d002234..11b9c655de8ffe7f6d9ab8d1f7fcd119001769cf 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,19 +37,26 @@ msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
 msgid "Error configuring Google Drive storage"
 msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
-#: lib/config.php:423
+#: 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 "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
-#: lib/config.php:426
+#: 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 "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
+#: 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 "Kanpoko Biltegiratzea"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 1b97a4c57e96984ece2967c7b2fcd8883f62e2b9..5b5bb58738425ce1c2a505ec9b48876ebb801bba 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 13:26+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,24 +25,24 @@ msgstr "Pasahitza"
 msgid "Submit"
 msgstr "Bidali"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sk zurekin %s karpeta elkarbanatu du"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sk zurekin %s fitxategia elkarbanatu du"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ez dago aurrebista eskuragarririk hauentzat "
 
-#: templates/public.php:37
+#: 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 4ee77f2b6c02717bff9eb9682a487e85820e3215..649a2d0cfb395b355f5a615bb1f0f75cbf284991 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Ezin izan da %s betirako ezabatu"
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "berreskuratu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Errorea"
 
@@ -40,31 +39,31 @@ msgstr "Errorea"
 msgid "delete file permanently"
 msgstr "ezabatu fitxategia betirako"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Izena"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 867a9523a0917df667f87fb39afe8c08fff3d9a5..284ceaf733e1d97474d2650d119d6541189bd81b 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-03 00:05+0100\n"
-"PO-Revision-Date: 2013-03-02 21:30+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index e7140ec247ac9388114b175377e3133d9fc9cd36..0f237545725b742868705096731f9fa20cf4a4b7 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,47 +17,47 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Laguntza"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplikazioak"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "ezin izan da zehaztu"
 
@@ -69,7 +67,7 @@ msgstr "Aplikazioa ez dago gaituta"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Autentikazio errorea"
+msgstr "Autentifikazio errorea"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -95,10 +93,6 @@ msgstr "Ezarri administraziorako erabiltzaile izena."
 msgid "Set an admin password."
 msgstr "Ezarri administraziorako pasahitza."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Zehaztu data karpeta."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,79 +113,83 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB errorea: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Errorea komando honek sortu du: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Ezabatu erabiltzaile hau MySQLtik"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Ezabatu erabiltzaile hau MySQLtik."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "orain dela segundu batzuk"
+msgstr "segundu"
 
 #: template.php:114
 msgid "1 minute ago"
@@ -226,7 +224,7 @@ msgstr "orain dela %d egun"
 
 #: template.php:121
 msgid "last month"
-msgstr "joan den hilabetea"
+msgstr "joan den hilabetean"
 
 #: template.php:122
 #, php-format
@@ -235,24 +233,11 @@ msgstr "orain dela %d hilabete"
 
 #: template.php:123
 msgid "last year"
-msgstr "joan den urtea"
+msgstr "joan den urtean"
 
 #: template.php:124
 msgid "years ago"
-msgstr "orain dela urte batzuk"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s eskuragarri dago. Lortu <a href=\"%s\">informazio gehiago</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "eguneratuta"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "eguneraketen egiaztapena ez dago gaituta"
+msgstr "urte"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index ba6c4c71e57afd07b44aaa3ca7a8d5640153156c..c46f05695ce743c03ceec67ca3ccd65262f00a9a 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
-# Asier Urio Larrea <asieriko@gmail.com>, 2011.
-# Piarres Beobide <pi@beobide.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentifikazio errorea"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Ezin izan da bistaratze izena aldatu"
 
@@ -68,7 +68,7 @@ msgstr "Hizkuntza aldatuta"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Baliogabeko eskaria"
+msgstr "Baliogabeko eskaera"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -120,52 +120,52 @@ msgstr "Errorea aplikazioa eguneratzen zen bitartean"
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "ezabatuta"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "desegin"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Ezin izan da erabiltzailea aldatu"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Taldeak"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Talde administradorea"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "gehitu taldea"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Baliozko erabiltzaile izena eman behar da"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Errore bat egon da erabiltzailea sortzean"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -316,19 +316,19 @@ msgstr "Egunkaria"
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
 msgid "Show First Run Wizard again"
 msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -423,82 +423,74 @@ msgstr "Pasahitz berria"
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Bistaratze Izena"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Zure bistaratze izena aldatu da"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Ezin izan da zure bistaratze izena aldatu"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Aldatu bistaratze izena"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "E-Posta"
+msgstr "E-posta"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Sarrera Izena"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Sortu"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Lehenetsitako Biltegiratzea"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Mugarik gabe"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "Besteak"
+msgstr "Bestelakoa"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Biltegiratzea"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "aldatu bistaratze izena"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "ezarri pasahitz berria"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 7b70c5469a61dcc80d036badf23dcc87a2717524..0c4381c59a7a4c58c8568e11b752b24e71410ba8 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +17,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du"
@@ -55,281 +57,363 @@ msgstr "Mantendu ezarpenak?"
 msgid "Cannot add server configuration"
 msgstr "Ezin da zerbitzariaren konfigurazioa gehitu"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Arrakasta"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Errorea"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Konexio froga ongi burutu da"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Konexio frogak huts egin du"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Baieztatu Ezabatzea"
 
-#: templates/settings.php:8
+#: 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 "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
 
-#: templates/settings.php:11
+#: 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 "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Gehitu Zerbitzariaren Konfigurazioa"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hostalaria"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "DN Oinarri bat lerroko"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Erabiltzaile DN"
 
-#: templates/settings.php:45
+#: 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 "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
-#: templates/settings.php:53
+#: 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 "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Konexio Ezarpenak"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurazio Aktiboa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Babeskopia (Replica) Ostalaria"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Babeskopia (Replica) Ataka"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desgaitu Zerbitzari Nagusia"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Katxearen Bizi-Iraupena"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Karpetaren Ezarpenak"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Erabiltzaile DN Oinarri bat lerroko"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Erabili Bilaketa Atributuak "
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Talde DN Oinarri bat lerroko"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Taldekatu Bilaketa Atributuak "
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kuota Eremua"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kuota Lehenetsia"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Eposta eremua"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
-#: templates/settings.php:99
+#: 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 "Egiaztatu Konfigurazioa"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index ada89a92f4d221189fb7dc503c3ca010f2cd25e3..c9297b3ff2eeafbef61fd740c64b81fb2dee6033 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <asieriko@gmail.com>, 2013.
-#   <asieriko@gmail.com>, 2012.
+# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-20 00:05+0100\n"
-"PO-Revision-Date: 2013-01-18 23:47+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +27,7 @@ msgstr "WebDAV Autentikazioa"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 2708fceb96483e82494599d7f4e425d67311ed33..be2a16bba06daf46e0f0f905a3cc55d17edc9b9a 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hossein nag <h.sname@yahoo.com>, 2012.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -162,75 +160,79 @@ msgstr "دسامبر"
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{دقیقه ها} دقیقه های پیش"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ساعت پیش"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{ساعت ها} ساعت ها پیش"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{روزها} روزهای پیش"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{ماه ها} ماه ها پیش"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "سال‌های قبل"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "انتخاب کردن"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "منصرف شدن"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "نه"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "بله"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "نه"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "قبول"
 
@@ -261,7 +263,7 @@ msgstr "اشتراک گذاشته شده"
 
 #: js/share.js:90
 msgid "Share"
-msgstr "اشتراک‌گزاری"
+msgstr "اشتراک‌گذاری"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
@@ -295,7 +297,7 @@ msgstr "به اشتراک گذاشتن با پیوند"
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -398,24 +400,27 @@ msgstr "پسورد ابرهای شما تغییرکرد"
 msgid "Use the following link to reset your password: {link}"
 msgstr "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "تنظیم مجدد ایمیل را بفرستید."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "درخواست رد شده است !"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "شناسه"
+msgstr "نام کاربری"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "درخواست دوباره سازی"
 
@@ -441,11 +446,11 @@ msgstr "شخصی"
 
 #: strings.php:6
 msgid "Users"
-msgstr "کاربر ها"
+msgstr "کاربران"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "برنامه"
+msgstr "  برنامه ها"
 
 #: strings.php:8
 msgid "Admin"
@@ -453,7 +458,7 @@ msgstr "مدیر"
 
 #: strings.php:9
 msgid "Help"
-msgstr "Ú©Ù…Ú©"
+msgstr "راه‌نما"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -465,7 +470,7 @@ msgstr "پیدا نشد"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "ویرایش گروه ها"
+msgstr "ویرایش گروه"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -515,81 +520,86 @@ msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازی
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "حرفه ای"
+msgstr "پیشرفته"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "جدول پایگاه داده"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "سرویس وب تحت کنترل شما"
+msgstr "سرویس های تحت وب در کنترل شما"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "خروج"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ورود به سیستم اتوماتیک ردشد!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "اگر شما اخیرا رمزعبور را تغییر نداده اید، حساب شما در معرض خطر می باشد !"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "لطفا رمز عبور خود را تغییر دهید تا مجددا حساب شما  در امان باشد."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "بیاد آوری"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "ورود"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "ورود متناوب"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index ace762323cc91b026e6b73050d40cf852e2c2409..6ef2b14e0ad9db986c094a056b2671e55c66ca8b 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hossein nag <h.sname@yahoo.com>, 2012.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
-# vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 05:10+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,17 +27,13 @@ msgstr "%s نمی تواند حرکت کند - در حال حاضر پرونده
 msgid "Could not move %s"
 msgstr "%s نمی تواند حرکت کند "
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "هیچ خطایی وجود ندارد فایل با موفقیت بار گذاری شد"
+msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,19 +44,19 @@ msgstr "پرونده آپلود شده بیش ازدستور  ماکزیمم_ح
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "حداکثر حجم مجاز برای بارگذاری از طریق HTML \nMAX_FILE_SIZE"
+msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "مقدار کمی از فایل بارگذاری شده"
+msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "هیچ فایلی بارگذاری نشده"
+msgstr "هیچ پروندهای بارگذاری نشده"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "یک پوشه موقت گم شده است"
+msgstr "یک پوشه موقت گم شده"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -80,57 +72,61 @@ msgstr "فهرست راهنما نامعتبر می باشد."
 
 #: appinfo/app.php:12
 msgid "Files"
-msgstr "فایل ها"
+msgstr "پرونده‌ها"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "اشتراک‌گذاری"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "پاک کردن"
+msgstr "حذف"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "پیشنهاد نام"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "انجام عمل حذف"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 پرونده آپلود شد."
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "بارگذاری فایل ها"
 
@@ -156,72 +152,80 @@ msgstr "فضای ذخیره ی شما کاملا پر است، بیش از ای
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL  نمی تواند خالی باشد."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "خطا"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "تغییر یافته"
+msgstr "تاریخ"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "قادر به تغییر نام پرونده نیست."
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "بارگذاری"
+msgstr "بارگزاری"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -279,37 +283,37 @@ msgstr "فایل های حذف شده"
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "شما اجازه ی نوشتن در اینجا را ندارید"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "بارگیری"
+msgstr "دانلود"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "حجم بارگذاری بسیار زیاد است"
+msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
 
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index f9ee7fcc63baa9e486469e7dc68a5a5abe34b9ad..67d35105e3b406fc3a513458e3cec20e51bc3853 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <basir.jafarzadeh@gmail.com>, 2012.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-19 00:04+0100\n"
-"PO-Revision-Date: 2013-03-18 11:40+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +17,87 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "در حال ذخیره سازی..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "رمزگذاری"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "رمزنگاری فایلها فعال شد."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "فایلهای زیر رمزنگاری نخواهند شد:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "فایلهای زیر از رمزنگاری نادیده گرفته می شوند:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "هیچ‌کدام"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 99b3b036b7533dfcfd8891c7ecf68c6ccb6fa3fc..6b9d66b9379c4632ef41ba54e7140ad8096472b3 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 "حافظه خارجی"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index e72b1ce1dc6c506b90f966f49e58224ae7d1810a..ee80c80cffc67d0579439b68b5d957eb2df9d24a 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 11:20+0000\n"
-"Last-Translator: Amir Reza Asadi <amirreza.asadi@live.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,24 +25,24 @@ msgstr "گذرواژه"
 msgid "Submit"
 msgstr "ثبت"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%sپوشه %s را با شما به اشتراک گذاشت"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%sفایل %s را با شما به اشتراک گذاشت"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "هیچگونه پیش نمایشی موجود نیست"
 
-#: templates/public.php:35
+#: 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 bb1b51c7efbd5c2f3554a3450456a7017ecae82f..5160bbb6762b9b6329519062fa25b6fe781bb0f4 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "%s را نمی توان برای همیشه حذف کرد"
 msgid "Couldn't restore %s"
 msgstr "%s را نمی توان بازگرداند"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "انجام عمل بازگرداندن"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "خطا"
 
@@ -40,31 +39,31 @@ msgstr "خطا"
 msgid "delete file permanently"
 msgstr "حذف فایل برای همیشه"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "نام"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "حذف شده"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 325fdb2a87fb69edeff7af7b8667ed709a401a6f..191735399243abb2995b1067316cd603ffa8d1f6 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -43,11 +40,11 @@ msgstr "شکست"
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "هیچ نسخه قدیمی در دسترس نیست"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "هیچ مسیری مشخص نشده است"
 
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 4702ff300e5217821df01f68e49baf7805f65f4f..138a9f5b4c7e3789968d77322e1f73a5e777b0d4 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-06 13:40+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +17,47 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "راه‌نما"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "شخصی"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "کاربران"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "  برنامه ها"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "مدیر"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "دانلود به صورت فشرده غیر فعال است"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "فایل ها باید به صورت یکی یکی دانلود شوند"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "بازگشت به فایل ها"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -96,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "پوشه ای برای داده ها مشخص کنید."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
@@ -242,19 +239,6 @@ msgstr "سال قبل"
 msgid "years ago"
 msgstr "سال‌های قبل"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 3037631b1b152f9adb1575723696fa3d7e239dea..1d1284b04ef0719c5b4bac9023a71e1785e2f4e2 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
-#   <basir.jafarzadeh@gmail.com>, 2012.
-# Hossein nag <h.sname@yahoo.com>, 2012.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
-#   <tamass4116@gmail.com>, 2012.
-# vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 05:40+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "خطا در اعتبار سنجی"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "امکان تغییر نام نمایشی شما وجود ندارد"
 
@@ -70,7 +68,7 @@ msgstr "زبان تغییر کرد"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "درخواست غیر قابل قبول"
+msgstr "درخواست نامعتبر"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -122,52 +120,52 @@ msgstr "خطا در هنگام بهنگام سازی برنامه"
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "درحال ذخیره ..."
+msgstr "در حال ذخیره سازی..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "حذف شده"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "حذف کاربر امکان پذیر نیست"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "گروه ها"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "گروه مدیران"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "پاک کردن"
+msgstr "حذف"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "افزودن گروه"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "نام کاربری صحیح باید وارد شود"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "خطا در ایجاد کاربر"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "رمز عبور صحیح باید وارد شود"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -312,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "کارنامه"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +399,7 @@ msgstr "برنامه ها را دریافت کنید تا فایل هایتان
 msgid "Show First Run Wizard again"
 msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -425,82 +423,74 @@ msgstr "گذرواژه جدید"
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "نام نمایشی شما تغییر یافت"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "امکان تغییر نام نمایشی شما وجود ندارد"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "تغییر نام نمایشی"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "پست الکترونیکی"
+msgstr "ایمیل"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت فایل خودتان استفاده کنید"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "نام کاربری"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "ایجاد کردن"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "ذخیره سازی پیش فرض"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "نامحدود"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "سایر"
+msgstr "دیگر"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "حافظه"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "تغییر نام نمایشی"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "تنظیم کلمه عبور جدید"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "پیش فرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 59c855c010f3ead9a4a5aa7030073408ba603840..1c94dc4aea40c3fb3d161dcbb9d1d1b26c37ceca 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Amir Reza Asadi <amirreza.asadi@live.com>, 2013.
-# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
-# Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "عملیات حذف پیکربندی سرور ناموفق ماند"
@@ -56,281 +57,363 @@ msgstr "آیا تنظیمات ذخیره شود ؟"
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "تست اتصال ناموفق بود"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "تایید حذف"
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "پیکربندی سرور"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "افزودن پیکربندی سرور"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "میزبانی"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr "رمز عبور"
+msgstr "گذرواژه"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "فیلتر گروه"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "در بایت"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "راه‌نما"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index e4088da32dd6c3c42af2336a690dd7e4b994bd7e..f89e5c1febbda3f5564b596c173c4a214bedfc51 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index d032fb35180b48667747e1bb9af98b975c5255f7..3c7faf864aea71f98882fb171f3e87a7abd756b3 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr "asetukset"
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -237,8 +241,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 41347387bc6df87730d1bf186566ccfe9785bbf6..127a50cbd0de582f49ff37a8152f7c6e17fb2ab3 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/fi/files_encryption.po b/l10n/fi/files_encryption.po
index 8aa6088c38ea9e8879dc9340be9a7ab49a55393c..93c8ed46e2f2f38efa36a73a84197f91e49c2098 100644
--- a/l10n/fi/files_encryption.po
+++ b/l10n/fi/files_encryption.po
@@ -7,28 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/fi/files_external.po b/l10n/fi/files_external.po
index d37cbbef3786a7de4fe6a0c0705a27a26e00c067..3281188f3b4d0f58ccd25932dc380f4ef5ef0105 100644
--- a/l10n/fi/files_external.po
+++ b/l10n/fi/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,90 +17,107 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+#: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr ""
-
-#: js/dropbox.js:85
+#: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:26 js/google.js:73 js/google.js:78
+#: 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:7 templates/settings.php:19
-msgid "Mount point"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
 msgstr ""
 
-#: templates/settings.php:8
-msgid "Backend"
+#: templates/settings.php:10
+msgid "External storage"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:11
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:12
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
-msgid "Add mount point"
+#: templates/settings.php:33
+msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:90
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:91
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:92
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:100
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:129
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:141
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:159
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index fcba73eea448e91f7d1af8092a945b1145b56cb1..ce314f8d2aa16ba120df0c46c5f0d20c7e6ac538 100644
--- a/l10n/fi/files_sharing.po
+++ b/l10n/fi/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/fi/files_trashbin.po b/l10n/fi/files_trashbin.po
new file mode 100644
index 0000000000000000000000000000000000000000..7cf44f62a8e927bbc842c9d7e4cd829aa274b373
--- /dev/null
+++ b/l10n/fi/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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:96
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:121
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:174 templates/index.php:17
+msgid "Name"
+msgstr ""
+
+#: js/trash.js:175 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:184
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:186
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:194
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:196
+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/fi/files_versions.po b/l10n/fi/files_versions.po
index 7317ba1f3e422757ff622b32b6aa05f7e5987a1a..12a72b999d1fb09fff7016c0e9e7db17604dab21 100644
--- a/l10n/fi/files_versions.po
+++ b/l10n/fi/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,41 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: history.php:40
+msgid "success"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
+#: 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 ""
 
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: history.php:74
+msgid "No path specified"
 msgstr ""
 
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:6
+msgid "Versions"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Enable"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index e5c2bbd74a4ddcd89e92ac982e2adadc9774680e..6563cd823d7b701afe2a80f59f02632e6e335926 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/lib.po
@@ -7,57 +7,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "asetukset"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 4be7031174a5d2f2d4beec7ed3833be22ee96775..1e9abc85b85032b91ec450bff29036b551225388 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,86 +17,163 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/creategroup.php:19
+#: 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:28
+#: ajax/creategroup.php:19
 msgid "Unable to add group"
 msgstr ""
 
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:11
 msgid "Could not enable app. "
 msgstr ""
 
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:16
-msgid "OpenID Changed"
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
-msgid "Invalid request"
+#: ajax/removeuser.php:24
+msgid "Unable to delete user"
 msgstr ""
 
-#: ajax/removegroup.php:16
-msgid "Unable to delete group"
+#: ajax/setlanguage.php:15
+msgid "Language changed"
 msgstr ""
 
-#: ajax/removeuser.php:22
-msgid "Unable to delete user"
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
 msgstr ""
 
-#: ajax/setlanguage.php:18
-msgid "Language changed"
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
 msgstr ""
 
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr ""
 
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr ""
 
-#: js/apps.js:28 js/apps.js:65
+#: 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:28 js/apps.js:54
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
 msgstr ""
 
-#: js/personal.js:69
+#: 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 ""
 
-#: personal.php:47 personal.php:48
+#: 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:83
+#: templates/users.php:108
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:160
+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:14
+#: templates/admin.php:15
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:17
+#: 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 "
@@ -105,71 +182,153 @@ msgid ""
 " webserver document root."
 msgstr ""
 
-#: templates/admin.php:31
+#: 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:37
+#: templates/admin.php:101
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:43
+#: 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:49
+#: 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:56
+#: templates/admin.php:128
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:61
+#: templates/admin.php:134
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:62
+#: templates/admin.php:135
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:142
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:68
+#: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:73
+#: templates/admin.php:150
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:74
+#: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:79
+#: templates/admin.php:158
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:81
+#: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:88
+#: 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:116
+#: templates/admin.php:196
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:124
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:105
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -179,143 +338,159 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:11
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:12
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:28
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/apps.php:38
+msgid "Update"
 msgstr ""
 
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:4
+msgid "User Documentation"
 msgstr ""
 
-#: templates/help.php:11
-msgid "Ask a question"
+#: templates/help.php:6
+msgid "Administrator Documentation"
 msgstr ""
 
-#: templates/help.php:23
-msgid "Problems connecting to help database."
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
 msgstr ""
 
-#: templates/help.php:24
-msgid "Go there manually."
+#: templates/help.php:14
+msgid "Bugtracker"
 msgstr ""
 
-#: templates/help.php:32
-msgid "Answer"
+#: 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>"
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:13
-msgid "Download"
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+msgid "Password"
 msgstr ""
 
-#: templates/personal.php:19
+#: templates/personal.php:38
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:20
+#: templates/personal.php:39
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:21
+#: templates/personal.php:40
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:22
+#: templates/personal.php:42
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:23
-msgid "show"
+#: templates/personal.php:44
+msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:24
-msgid "Change password"
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:30
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:31
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:32
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:38 templates/personal.php:39
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
+#: templates/personal.php:94
+msgid "WebDAV"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:76
-msgid "Name"
+#: templates/personal.php:96
+msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:23 templates/users.php:77
-msgid "Password"
+#: templates/users.php:21 templates/users.php:80
+msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
-msgid "Groups"
+#: templates/users.php:30
+msgid "Create"
 msgstr ""
 
-#: templates/users.php:32
-msgid "Create"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
+msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:35
-msgid "Default Quota"
+#: templates/users.php:44 templates/users.php:138
+msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:80 templates/users.php:112
-msgid "Group Admin"
+#: templates/users.php:87
+msgid "Storage"
 msgstr ""
 
-#: templates/users.php:82
-msgid "Quota"
+#: templates/users.php:98
+msgid "change display name"
 msgstr ""
 
-#: templates/users.php:146
-msgid "Delete"
+#: templates/users.php:102
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:133
+msgid "Default"
 msgstr ""
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
index 5f8865fafa71e6bfd43d9eb79dde9954dad8c265..cd2c388c98c4d73e97fc5fb5d0ba700854ac946d 100644
--- a/l10n/fi/user_ldap.po
+++ b/l10n/fi/user_ldap.po
@@ -7,164 +7,413 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:8
+#: 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:8
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: 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:10
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: 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:11
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: 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:12
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: 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:18
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:19
-msgid "Base Group Tree"
+#: 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:20
-msgid "Group-Member association"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:21
+#: 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:21
-msgid "Do not use it for SSL connections, it will fail."
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: 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:23
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: 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:24
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: 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:25
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: 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:29
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:30
+#: 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:32
+#: 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/fi/user_webdavauth.po b/l10n/fi/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..9f3a7c03ab943b6d37fd46e50f3884e17001045a
--- /dev/null
+++ b/l10n/fi/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+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/fi_FI/core.po b/l10n/fi_FI/core.po
index a31c1466e446beaa3082ddceafa03731ccf1cfa1..8f9f3c5761deafd9f69d5266d0fc6543ca17c64e 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ari.takalo@iki.fi>, 2012.
-# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
-# Johannes Korpela <>, 2012.
-# Pekka Sutela <pekka.sutela@gmail.com>, 2012.
-#   <tehoratopato@gmail.com>, 2012.
-#   <tscooter@hotmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -89,153 +83,157 @@ msgstr "Virhe poistaessa kohdetta %s suosikeista."
 
 #: js/config.php:34
 msgid "Sunday"
-msgstr "Sunnuntai"
+msgstr "sunnuntai"
 
 #: js/config.php:35
 msgid "Monday"
-msgstr "Maanantai"
+msgstr "maanantai"
 
 #: js/config.php:36
 msgid "Tuesday"
-msgstr "Tiistai"
+msgstr "tiistai"
 
 #: js/config.php:37
 msgid "Wednesday"
-msgstr "Keskiviikko"
+msgstr "keskiviikko"
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr "Torstai"
+msgstr "torstai"
 
 #: js/config.php:39
 msgid "Friday"
-msgstr "Perjantai"
+msgstr "perjantai"
 
 #: js/config.php:40
 msgid "Saturday"
-msgstr "Lauantai"
+msgstr "lauantai"
 
 #: js/config.php:45
 msgid "January"
-msgstr "Tammikuu"
+msgstr "tammikuu"
 
 #: js/config.php:46
 msgid "February"
-msgstr "Helmikuu"
+msgstr "helmikuu"
 
 #: js/config.php:47
 msgid "March"
-msgstr "Maaliskuu"
+msgstr "maaliskuu"
 
 #: js/config.php:48
 msgid "April"
-msgstr "Huhtikuu"
+msgstr "huhtikuu"
 
 #: js/config.php:49
 msgid "May"
-msgstr "Toukokuu"
+msgstr "toukokuu"
 
 #: js/config.php:50
 msgid "June"
-msgstr "Kesäkuu"
+msgstr "kesäkuu"
 
 #: js/config.php:51
 msgid "July"
-msgstr "Heinäkuu"
+msgstr "heinäkuu"
 
 #: js/config.php:52
 msgid "August"
-msgstr "Elokuu"
+msgstr "elokuu"
 
 #: js/config.php:53
 msgid "September"
-msgstr "Syyskuu"
+msgstr "syyskuu"
 
 #: js/config.php:54
 msgid "October"
-msgstr "Lokakuu"
+msgstr "lokakuu"
 
 #: js/config.php:55
 msgid "November"
-msgstr "Marraskuu"
+msgstr "marraskuu"
 
 #: js/config.php:56
 msgid "December"
-msgstr "Joulukuu"
+msgstr "joulukuu"
 
 #: js/js.js:286
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} päivää sitten"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "vuotta sitten"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Valitse"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Peru"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ei"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Kyllä"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ei"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -300,7 +298,7 @@ msgstr "Jaa linkillä"
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Salasana"
 
@@ -403,24 +401,27 @@ msgstr "ownCloud-salasanan nollaus"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
+#: 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:5
-msgid "Reset email send."
-msgstr "Salasanan nollausviesti lähetetty."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Pyyntö epäonnistui!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Tilaus lähetetty"
 
@@ -442,7 +443,7 @@ msgstr "Palauta salasana"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Henkilökohtaiset"
+msgstr "Henkilökohtainen"
 
 #: strings.php:6
 msgid "Users"
@@ -454,7 +455,7 @@ msgstr "Sovellukset"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Hallinta"
+msgstr "Ylläpitäjä"
 
 #: strings.php:9
 msgid "Help"
@@ -493,7 +494,7 @@ msgstr "Päivitä PHP-asennuksesi käyttääksesi ownCloudia turvallisesti."
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus"
 
 #: templates/installation.php:33
 msgid ""
@@ -526,37 +527,37 @@ msgstr "Lisäasetukset"
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "käytetään"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
@@ -564,37 +565,42 @@ msgstr "Viimeistele asennus"
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automaattinen sisäänkirjautuminen hylättiin!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Jos et vaihtanut salasanaasi äskettäin, tilisi saattaa olla murrettu."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index dddff09f3037c1609fb3526c05717ad40fed1511..c797fa053dce19cf1f96fed5f4ac6dfcb603604c 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
-# Johannes Korpela <>, 2012.
-#   <tehoratopato@gmail.com>, 2012.
-#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -32,10 +27,6 @@ msgstr "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemas
 msgid "Could not move %s"
 msgstr "Kohteen %s siirto ei onnistunut"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Tiedoston nimeäminen uudelleen ei onnistunut"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
@@ -47,13 +38,13 @@ msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:"
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Lähetetty tiedosto ylittää HTML-lomakkeessa määritetyn MAX_FILE_SIZE-arvon ylärajan"
+msgstr "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -65,7 +56,7 @@ msgstr "Yhtäkään tiedostoa ei lähetetty"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Väliaikaiskansiota ei ole olemassa"
+msgstr "Tilapäiskansio puuttuu"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -83,55 +74,59 @@ msgstr "Virheellinen kansio."
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Jaa"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Poista"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "suorita poistotoiminto"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -157,69 +152,77 @@ msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkro
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
+msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Tilaa ei ole riittävästi"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjä"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Virhe"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Muutettu"
+msgstr "Muokattu"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
+#: 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 "Tiedoston nimeäminen uudelleen ei onnistunut"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Lähetä"
@@ -280,37 +283,37 @@ msgstr "Poistetut tiedostot"
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Tunnuksellasi ei ole kirjoitusoikeuksia tänne."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
 
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 3833503da06b99fafc70a4631898978e68e5490c..df1e78980c08532cdbdbdbd452f1120956a980b5 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:04+0100\n"
-"PO-Revision-Date: 2013-02-14 07:40+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,87 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "Salasana vaihdettiin onnistuneesti."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Tallennetaan..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Salaus"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Tiedostojen salaus on käytössä."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Ei käytössä"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Vaihda salasana"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
 
 #: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Seuraavia tiedostotyyppejä ei salata:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Älä salaa seuravia tiedostotyyppejä:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ei mitään"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 829e7f111b2f6be9b8b671cd685ed62ed5c55266..799f6ad90bd291fd12456f25ee0eaf0668df7a37 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ari.takalo@iki.fi>, 2012.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
-#   <tehoratopato@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-31 00:01+0100\n"
-"PO-Revision-Date: 2013-03-30 09:40+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,19 +37,26 @@ msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
 msgid "Error configuring Google Drive storage"
 msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
 
-#: lib/config.php:423
+#: 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 "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan smbclient."
 
-#: lib/config.php:426
+#: 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 "<b>Varoitus:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. FTP-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön."
 
+#: 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 "<b>Varoitus:</b> PHP:n Curl-tuki ei ole käytössä tai sitä ei ole lainkaan asennettu. ownCloudin, WebDAV:in tai Google Driven liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan Curl-tuki käyttöön."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Erillinen tallennusväline"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 8bdb2b410f99149eac246738569b0bdc08d40e56..5e32d3b535dd16912c9197a8dbf738b7a8f55335 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
-#   <tehoratopato@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,24 +25,24 @@ msgstr "Salasana"
 msgid "Submit"
 msgstr "Lähetä"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s jakoi kansion %s kanssasi"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s jakoi tiedoston %s kanssasi"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ei esikatselua kohteelle"
 
-#: templates/public.php:37
+#: 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 1b22f0ce780267c0f46a2c3aca41cc3cab06efbf..67e93e12bacf662aa856c554fd4f419b8cd8fcc8 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epäonnistui"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "suorita palautustoiminto"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Virhe"
 
@@ -40,31 +39,31 @@ msgstr "Virhe"
 msgid "delete file permanently"
 msgstr "poista tiedosto pysyvästi"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index 90ba537696a1081f8cb088ebc53591bd9cd463f0..c93ead204dc95bb7344382ee8cd850002822ae38 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 06:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index e7aa43b18317414e90ec24c4116d5cfd20c60c50..d20992d2c84f7ed0fade621132cf6be51adced7b 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 06:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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,47 +18,47 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ohje"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Asetukset"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Sovellukset"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu käytöstä."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittäin."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "ei voitu määrittää"
 
@@ -68,7 +68,7 @@ msgstr "Sovellusta ei ole otettu käyttöön"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Todennusvirhe"
+msgstr "Tunnistautumisvirhe"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -94,10 +94,6 @@ msgstr "Aseta ylläpitäjän käyttäjätunnus."
 msgid "Set an admin password."
 msgstr "Aseta ylläpitäjän salasana."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Määritä datakansio."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +114,76 @@ msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 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:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Oracle-yhteyttä ei voitu muodostaa"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Tietokantavirhe: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Pudota tämä käyttäjä MySQL:stä"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Pudota tämä käyttäjä MySQL:stä."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
@@ -240,19 +240,6 @@ msgstr "viime vuonna"
 msgid "years ago"
 msgstr "vuotta sitten"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s on saatavilla. Lue <a href=\"%s\">lisätietoja</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ajan tasalla"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "päivitysten tarkistus on pois käytöstä"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index b2f910134fbe9b1f1253da1ae0028d408d397821..ae577b6479ba285afdcfb5da29ced0dd31fdd50b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jesse Jaara <jesse.jaara@gmail.com>, 2012.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
-#   <tehoratopato@gmail.com>, 2012.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Todennusvirhe"
+msgstr "Tunnistautumisvirhe"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Näyttönimesi on muutettu."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Näyttönimen muuttaminen epäonnistui"
 
@@ -119,52 +121,52 @@ msgstr "Virhe sovellusta päivittäessä"
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "poistettu"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "kumoa"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Käyttäjän poistaminen ei onnistunut"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Ryhmän ylläpitäjä"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Poista"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "lisää ryhmä"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Virhe käyttäjää luotaessa"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -315,19 +317,19 @@ msgstr "Loki"
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +400,7 @@ msgstr ""
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Salasana"
 
@@ -422,82 +424,74 @@ msgstr "Uusi salasana"
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Näyttönimesi muutettiin"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Näyttönimen muuttaminen epäonnistui"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Muuta näyttönimeä"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Sähköposti"
+msgstr "Sähköpostiosoite"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Luo"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Oletustallennustila"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Tallennustila"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "vaihda näyttönimi"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "aseta uusi salasana"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index f6ea6620975ba4bf9edeb30493240d6c795d129c..8dc1297ab7f53f78fb7c5995eb0d160440ce387c 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <jarkko.moilanen@want3d.fi>, 2012.
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
-#   <tehoratopato@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-31 00:01+0100\n"
-"PO-Revision-Date: 2013-03-30 09:40+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -56,281 +57,363 @@ msgstr "Säilytetäänkö asetukset?"
 msgid "Cannot add server configuration"
 msgstr "Palvelinasetusten lisäys epäonnistui"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Onnistui!"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Virhe"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Yhteystesti onnistui"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Yhteystesti epäonnistui"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Vahvista poisto"
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Isäntä"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Oletus DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Käyttäjän DN"
 
-#: templates/settings.php:45
+#: 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 "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Login suodatus"
 
-#: templates/settings.php:53
+#: 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 "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Käyttäjien suodatus"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  "
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Ryhmien suodatus"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  "
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Yhteysasetukset"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portti"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Poista pääpalvelin käytöstä"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Käytä TLS:ää"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Poista käytöstä SSL-varmenteen vahvistus"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ei suositella, käytä vain testausta varten."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Hakemistoasetukset"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Käyttäjän näytettävän nimen kenttä"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Oletuskäyttäjäpuu"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Sähköpostikenttä"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index e1fa0ca8d17ce9550bb8f057265e1ed6998fb8bb..03611071936b7c233bc450c402e0d7dac0f90abe 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013.
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-15 00:05+0100\n"
-"PO-Revision-Date: 2013-02-14 14:00+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index cd949b9019e86da21c9d5475a1d31c21e8b80011..a17aa5fff0f985fa5151e57f331064f607737dfd 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,27 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
-# David Basquin <dba@alternalease.fr>, 2013.
-#   <dba@alternalease.fr>, 2013.
-# Fabian Lemaître <ptit.boogy@gmail.com>, 2013.
-#   <fkhannouf@me.com>, 2012.
-#   <florentin.lemoal@gmail.com>, 2012.
-# Guillaume Paumier <guillom.pom@gmail.com>, 2012-2013.
-#   <mishka.lazzlo@gmail.com>, 2012.
-# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
-#   <nathaplop@gmail.com>, 2012.
-#   <nicolas@shivaserv.fr>, 2012.
-# Robert Di Rosa <>, 2013.
-#   <rom1dep@gmail.com>, 2011.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# msoko <sokolovitch@yahoo.com>, 2013
+# plachance <patlachance@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Guillaume Paumier <guillom.pom@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
+"Last-Translator: msoko <sokolovitch@yahoo.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"
@@ -87,7 +75,7 @@ msgstr "Erreur lors de l'ajout de %s aux favoris."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Aucune catégorie sélectionnée pour suppression"
+msgstr "Pas de catégorie sélectionnée pour la suppression."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -174,75 +162,79 @@ msgstr "décembre"
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "il y a {minutes} minutes"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Il y a {hours} heures"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "il y a {days} jours"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Il y a {months} mois"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Choisir"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annuler"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Non"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Non"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -307,7 +299,7 @@ msgstr "Partager via lien"
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -410,24 +402,27 @@ msgstr "Réinitialisation de votre mot de passe Owncloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
+#: 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 "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Mail de réinitialisation envoyé."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "La requête a échoué !"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Demander la réinitialisation"
 
@@ -449,7 +444,7 @@ msgstr "Réinitialiser le mot de passe"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Personnels"
+msgstr "Personnel"
 
 #: strings.php:6
 msgid "Users"
@@ -477,7 +472,7 @@ msgstr "Introuvable"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Modifier les catégories"
+msgstr "Editer les catégories"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -533,37 +528,37 @@ msgstr "Avancé"
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "sera utilisé"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utilisateur pour la base de données"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tablespaces de la base de données"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
@@ -571,37 +566,42 @@ msgstr "Terminer l'installation"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Connexion automatique rejetée !"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "se souvenir de moi"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index edf0f8f11a58695800bf0f3f0bdc4ba72a2e4bb5..a092018dce0c56c8b77210f6d907cc01daf7190d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -3,29 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013.
-# Cédric MARTIN <sid50.martin@gmail.com>, 2013.
-# Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
-# Cyril Glapa <kyriog@gmail.com>, 2012.
-# David Basquin <dba@alternalease.fr>, 2013.
-#   <dba@alternalease.fr>, 2013.
-# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
-#   <gp4004@arghh.org>, 2012.
-#   <guiguidu31300@gmail.com>, 2012.
-# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
-#   <life_0n_mars@live.fr>, 2012.
-# Nahir Mohamed <nahirmoha@gmail.com>, 2012.
-# Robert Di Rosa <>, 2012-2013.
-#   <rom1dep@gmail.com>, 2011.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
-#  <zrk951@gmail.com>, 2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2013
+# MathieuP <mathieu.payrol@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -43,17 +29,13 @@ msgstr "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà"
 msgid "Could not move %s"
 msgstr "Impossible de déplacer %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Impossible de renommer le fichier"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Aucun fichier n'a été chargé. Erreur inconnue"
+msgstr "Aucun fichier n'a été envoyé. Erreur inconnue"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Aucune erreur, le fichier a été téléversé avec succès"
+msgstr "Aucune erreur, le fichier a été envoyé avec succès."
 
 #: ajax/upload.php:27
 msgid ""
@@ -64,19 +46,19 @@ msgstr "Le fichier envoyé dépasse la valeur upload_max_filesize située dans l
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Le fichier téléversé excède la valeur de MAX_FILE_SIZE spécifiée dans le formulaire HTML"
+msgstr "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Le fichier n'a été que partiellement téléversé"
+msgstr "Le fichier n'a été que partiellement envoyé."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Aucun fichier n'a été téléversé"
+msgstr "Pas de fichier envoyé."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Il manque un répertoire temporaire"
+msgstr "Absence de dossier temporaire."
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -94,57 +76,61 @@ msgstr "Dossier invalide."
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Partager"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "En cours"
+msgstr "En attente"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "effectuer l'opération de suppression"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "1 fichier en cours de téléchargement"
+msgstr "1 fichier en cours d'envoi"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "fichiers en cours d'envoi"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -168,69 +154,77 @@ msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être t
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
+msgstr "Impossible d'envoyer votre fichier dans la mesure où il s'agit d'un répertoire ou d'un fichier de taille nulle"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Espace disponible insuffisant"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "Chargement annulé."
+msgstr "Envoi annulé."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-être vide"
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erreur"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fichiers"
 
+#: lib/app.php:53
+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"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Impossible de renommer le fichier"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Envoyer"
@@ -291,37 +285,37 @@ msgstr "Fichiers supprimés"
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Vous n'avez pas le droit d'écriture ici."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Fichier trop volumineux"
+msgstr "Téléversement trop volumineux"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Analyse en cours"
 
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 7c41515ad8892bb77f6379ecf7099beb3bdf423f..e5b30416823b4b8a50baf16b8c105df5673178d4 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Enregistrement..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Le chiffrement des fichiers est activé"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Les fichiers de types suivants ne seront pas chiffrés :"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants :"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Aucun"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 60179f9dd4ec77afc4803d162901ee95e474babc..b7dc04db5642341b9a0a4dd729bc22e49d8ad254 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <nicolas@shivaserv.fr>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012.
-#  <zrk951@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Zertrin <zrk951@gmail.com>\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"
 "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"
@@ -40,19 +37,26 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas
 msgid "Error configuring Google Drive storage"
 msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:426
+#: 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 "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer."
 
+#: 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 "<b>Attention :</b> Le support de Curl n'est pas activé ou installé dans PHP. Le montage de ownCloud / WebDAV ou GoogleDrive n'est pas possible. Contactez votre administrateur système pour l'installer."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Stockage externe"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 36628ca4e7d3f9c1bbb18c41c52d5618eb6ade47..f8171e53ba13b02458886a6fd0e8b6a17a43690f 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <florentin.lemoal@gmail.com>, 2012.
-#   <gp4004@arghh.org>, 2012.
-# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012.
-#   <windes@tructor.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 14:21+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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"
 "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"
@@ -30,24 +25,24 @@ msgstr "Mot de passe"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partagé le répertoire %s avec vous"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partagé le fichier %s avec vous"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Pas d'aperçu disponible pour"
 
-#: templates/public.php:37
+#: 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 456f103b975e8bbda8b7b48a25c59a6841d89582..cf2e6250af81d82315eefa08c541950ef0d030e7 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cédric MARTIN <sid50.martin@gmail.com>, 2013.
-# Romain DEP. <rom1dep@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Impossible d'effacer %s de façon permanente"
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "effectuer l'opération de restauration"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Erreur"
 
@@ -41,31 +39,31 @@ msgstr "Erreur"
 msgid "delete file permanently"
 msgstr "effacer définitivement le fichier"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Effacé"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} fichiers"
 
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index abef94b52e35728d9effd303efe9aa3356f61bb0..dd91318cfb4c79af70b3dc306e50f1edfb1f1c46 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
-#  <zrk951@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-13 00:05+0100\n"
-"PO-Revision-Date: 2013-03-12 19:21+0000\n"
-"Last-Translator: Zertrin <zrk951@gmail.com>\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"
 "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"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 16a076f35824ad7ba72ff1d20b1793cd11cdf782..3deb170aadc53deadf22f206db23bb2930120bda 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013.
-# Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
-# Robert Di Rosa <>, 2013.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# Cyril Glapa <kyriog@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,47 +18,47 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Aide"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personnel"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Paramètres"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Applications"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Téléchargement ZIP désactivé."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Les fichiers nécessitent d'être téléchargés un par un."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "impossible à déterminer"
 
@@ -97,10 +94,6 @@ msgstr "Spécifiez un nom d'utilisateur pour l'administrateur."
 msgid "Set an admin password."
 msgstr "Spécifiez un mot de passe administrateur."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Spécifiez un répertoire pour les données."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,83 +114,87 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 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:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "La connexion Oracle ne peut pas être établie"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erreur de la base de données : \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "La requête en cause est : \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Retirer cet utilisateur de la base MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Retirer cet utilisateur de la base MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, 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:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "à l'instant"
+msgstr "il y a quelques secondes"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "il y a 1 minute"
+msgstr "il y a une minute"
 
 #: template.php:115
 #, php-format
@@ -243,19 +240,6 @@ msgstr "l'année dernière"
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "À jour"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "la vérification des mises à jour est désactivée"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 39c3119416423ed6fd5760300e9699c2c45ccd17..809d6777e2996037e7984512743240c1ad012988 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,31 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013.
-# Brice  <bmaron@gmail.com>, 2012.
-# Cédric MARTIN <sid50.martin@gmail.com>, 2013.
-# Christophe Lherieau <skimpax@gmail.com>, 2013.
-# Cyril Glapa <kyriog@gmail.com>, 2012.
-#   <dba@alternalease.fr>, 2013.
-#   <fboulogne@april.org>, 2011.
-#   <florentin.lemoal@gmail.com>, 2012.
-#   <gp4004@arghh.org>, 2012.
-#   <guiguidu31300@gmail.com>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <life_0n_mars@live.fr>, 2012.
-#   <mishka.lazzlo@gmail.com>, 2012.
-# Nahir Mohamed <nahirmoha@gmail.com>, 2012-2013.
-#   <pierreamiel.giraud@gmail.com>, 2012.
-# Robert Di Rosa <>, 2012.
-#   <rom1dep@gmail.com>, 2011, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
-#  <thomash76@gmail.com>, 2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -40,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Votre nom d'affichage a bien été modifié."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Impossible de modifier le nom d'affichage"
 
@@ -135,52 +121,52 @@ msgstr "Erreur lors de la mise à jour de l'application"
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Sauvegarde..."
+msgstr "Enregistrement..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "supprimé"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "annuler"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Groupes"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Groupe Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit être saisi"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Erreur lors de la création de l'utilisateur"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Français"
 
@@ -331,19 +317,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -414,7 +400,7 @@ msgstr "Obtenez les applications de synchronisation de vos fichiers"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -438,82 +424,74 @@ msgstr "Nouveau mot de passe"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Votre nom d'affichage a bien été modifié"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Impossible de modifier votre nom d'affichage"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Changer le nom affiché"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "E-mail"
+msgstr "Adresse mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nom de la connexion"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Créer"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Support de stockage par défaut"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Support de stockage"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "Changer le nom affiché"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "Changer le mot de passe"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index f8a1920bec7086f9691cc9d7441ee5c090e4db60..413aa4f723433d18de17dcb7d9ce8ab07e87c78a 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyril Glapa <kyriog@gmail.com>, 2012.
-#   <mathieu.payrol@gmail.com>, 2012.
-#   <mishka.lazzlo@gmail.com>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
-#  <thomash76@gmail.com>, 2013.
-#   <windes@tructor.net>, 2012.
-#  <zrk951@gmail.com>, 2013.
-#   <zrk951@gmail.com>, 2012.
+# plachance <patlachance@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Zertrin <zrk951@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,13 +18,17 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Erreur lors de la suppression des associations."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Échec de la suppression de la configuration du serveur"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr "La configuration est valide est la connexion peut être établie !"
+msgstr "La configuration est valide et la connexion peut être établie !"
 
 #: ajax/testConfiguration.php:39
 msgid ""
@@ -59,283 +56,365 @@ msgstr "Garder ces paramètres ?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
-msgstr "Impossible d'ajouter la configuration du serveur."
+msgstr "Impossible d'ajouter la configuration du serveur"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "associations supprimées"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succès"
 
-#: js/settings.js:121
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erreur"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test de connexion réussi"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr "Le test de connexion a échoué"
+msgstr "Test de connexion échoué"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmer la suppression"
 
-#: templates/settings.php:8
+#: 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 "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles."
 
-#: templates/settings.php:11
+#: 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 "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuration du serveur"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Ajouter une configuration du serveur"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hôte"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr "DN Racine"
+msgstr "DN racine"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN racine par ligne"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
-#: templates/settings.php:45
+#: 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 "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
+msgstr "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Modèle d'authentification utilisateurs"
 
-#: templates/settings.php:53
+#: 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 "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Paramètres de connexion"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuration active"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Lorsque non cochée, la configuration sera ignorée."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Serveur de backup (réplique)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port du serveur de backup (réplique)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Désactiver le serveur principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible à la casse (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Désactiver la validation du certificat SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non recommandé, utilisation pour tests uniquement."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Durée de vie du cache"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Paramètres du répertoire"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN racine utilisateur par ligne"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Recherche des attributs utilisateur"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optionnel, un attribut par ligne"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN racine groupe par ligne"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Recherche des attributs du groupe"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Attributs spéciaux"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Champ du quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota par défaut"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr "en octets"
+msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Champ Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Convention de nommage du répertoire utilisateur"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nom d'utilisateur interne"
+
+#: 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 "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de convertion. Le nom d'utilisateur interne doit contenir seulement les caractères suivants: [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision le nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Nom d'utilisateur interne:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Surcharger la détection d'UUID"
+
+#: 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 "Par défaut, ownCloud détecte automatiquement l'attribut UUID. L'attribut UUID est utilisé pour identifier les utilisateurs et groupes de façon prédictive. De plus, le nom d'utilisateur interne sera créé basé sur l'UUID s'il n'est pas explicité ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Attribut UUID :"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
+
+#: 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 "ownCloud utilise les noms d'utilisateurs pour le stockage et l'assignation de (meta) data. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. ownCloud détectera le changement de DN, le cas échéant. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION. Le faire seulement sur les environnements de tests et d'expérimentation."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Supprimer l'association nom de groupe-groupe LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Tester la configuration"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index 4d665c8ff422130f9b5afd0e1625416490630b67..d1834912d730d8a5f223c60f1cebffaf418525f5 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013.
-#   <mishka.lazzlo@gmail.com>, 2013.
-#   <nicolas@shivaserv.fr>, 2012.
-# Robert Di Rosa <>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
+# Christophe Lherieau <skimpax@gmail.com>, 2013
+# mishka <mishka.lazzlo@gmail.com>, 2013
+# ouafnico <nicolas@shivaserv.fr>, 2012
+# Robert Di Rosa <>, 2012
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-25 00:05+0100\n"
-"PO-Revision-Date: 2013-01-24 01:04+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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"
 "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"
@@ -30,7 +30,7 @@ msgstr "Authentification WebDAV"
 msgid "URL: http://"
 msgstr "URL : http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 9dc63f31022429f6c609b5303e4e85f2ac2bc116..cd173b192de1bdf638a82170e28cbc1e7e537edd 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# antiparvos  <marcoslansgarza@gmail.com>, 2012.
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -77,7 +74,7 @@ msgstr "Produciuse un erro ao engadir %s aos favoritos."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Non hai categorías seleccionadas para eliminar."
+msgstr "Non se seleccionaron categorías para eliminación."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -162,77 +159,81 @@ msgstr "decembro"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Configuracións"
+msgstr "Axustes"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "hai {minutes} minutos"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "hai 1 hora"
+msgstr "Vai 1 hora"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "hai {hours} horas"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "hai {days} días"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "hai {months} meses"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Escoller"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Non"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Non"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -297,7 +298,7 @@ msgstr "Compartir coa ligazón"
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -400,24 +401,27 @@ msgstr "Restabelecer o contrasinal de ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usa a seguinte ligazón para restabelecer o contrasinal: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
+#: 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 "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aí pregúntelle ao seu administrador local.."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Restabelecer o envío por correo."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto."
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Non foi posíbel facer a petición"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Petición de restabelecemento"
 
@@ -451,7 +455,7 @@ msgstr "Aplicativos"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administración"
 
 #: strings.php:9
 msgid "Help"
@@ -467,7 +471,7 @@ msgstr "Nube non atopada"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Editar categorías"
+msgstr "Editar as categorías"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -523,37 +527,37 @@ msgstr "Avanzado"
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "vai ser utilizado"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Táboa de espazos da base de datos"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Rematar a configuración"
 
@@ -561,37 +565,42 @@ msgstr "Rematar a configuración"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Desconectar"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Rexeitouse a entrada automática"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Se non fixo recentemente cambios de contrasinal é posíbel que a súa conta estea comprometida!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Cambie de novo o seu contrasinal para asegurar a súa conta."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Conectar"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 7cb31be0d1ba1765fc38d59e8b90eaca837cf6b6..0ee9089b6a52b7623647da4f54586d7d87d3d6fa 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# antiparvos  <marcoslansgarza@gmail.com>, 2012-2013.
-# <mbouzada@gmail.com>, 2013.
-#  <mbouzada@gmail.com>, 2013.
-# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 14:40+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -32,17 +28,13 @@ msgstr "Non se moveu %s - Xa existe un ficheiro con ese nome."
 msgid "Could not move %s"
 msgstr "Non foi posíbel mover %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Non é posíbel renomear o ficheiro"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Non foi enviado ningún ficheiro. Produciuse un erro descoñecido."
+msgstr "Non se enviou ningún ficheiro. Produciuse un erro descoñecido."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Non se produciu ningún erro. O ficheiro enviouse correctamente"
+msgstr "Non houbo erros, o ficheiro enviouse correctamente"
 
 #: ajax/upload.php:27
 msgid ""
@@ -53,11 +45,11 @@ msgstr "O ficheiro enviado excede a directiva indicada por upload_max_filesize d
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "O ficheiro enviado excede a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
+msgstr "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "O ficheiro enviado foi só parcialmente enviado"
+msgstr "O ficheiro so foi parcialmente enviado"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -65,7 +57,7 @@ msgstr "Non se enviou ningún ficheiro"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Falta un cartafol temporal"
+msgstr "Falta o cartafol temporal"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -83,55 +75,59 @@ msgstr "O directorio é incorrecto."
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "realizar a operación de eliminación"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Enviándose 1 ficheiro"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ficheiros enviándose"
 
@@ -157,69 +153,77 @@ msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Non foi posíbel enviar o ficheiro pois ou é un directorio ou ten 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "O espazo dispoñíbel é insuficiente"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "O URL non pode quedar baleiro."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome de cartafol incorrecto. O uso de «Compartido» e «Shared» está reservado para o ownClod"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Non é posíbel renomear o ficheiro"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Enviar"
@@ -242,7 +246,7 @@ msgstr "Precísase para a descarga de varios ficheiros e cartafoles."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "Habilitar a descarga-ZIP"
+msgstr "Activar a descarga ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
@@ -280,37 +284,37 @@ msgstr "Ficheiros eliminados"
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Non ten permisos para escribir aquí."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 0f66e72f332dd11079286af03a730b473b43955b..df19cbea75f00ba055cca9e96493acaa345c4a92 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <mbouzada@gmail.com>, 2013.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 10:01+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 06:50+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"
@@ -19,22 +20,87 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Activada satisfactoriamente a chave de recuperación"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Desactivada satisfactoriamente a chave de recuperación"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "O contrasinal foi cambiado satisfactoriamente"
+
+#: ajax/changeRecoveryPassword.php:51
+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."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Gardando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "O cifrado de ficheiros está activado"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Recuperación do contrasinal da conta"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Activado"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr "Antigo contrasinal de recuperación da conta"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Novo contrasinal de recuperación da conta"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Os seguintes tipos de ficheiros non van seren cifrados:"
+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"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluír os seguintes tipos de ficheiros do cifrado:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Actualizouse o ficheiro de axustes de recuperación"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ningún"
+#: templates/settings-personal.php:28
+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 51b879d758d27a22791dabad426e13c2a9526868..11e70ec65498df351a2f1a536deca92bedd90622 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\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"
 "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"
@@ -40,19 +37,26 @@ msgstr "Forneza unha chave correcta e segreda do Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Aviso:</b> «smbclient» non está instalado. Non é posibel a montaxe de comparticións CIFS/SMB. Consulte co administrador do sistema para instalalo."
 
-#: lib/config.php:426
+#: 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 "<b>Aviso:</b> A compatibilidade de FTP en PHP non está activada ou instalada. Non é posibel a montaxe de comparticións FTP. Consulte co administrador do sistema para instalalo."
 
+#: 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 "<b>Aviso:</ b> A compatibilidade de Curl en PHP non está activada ou instalada. Non é posíbel a montaxe de ownCloud / WebDAV ou GoogleDrive. Consulte co administrador do sistema para instalala."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Almacenamento externo"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index d665b511c6dd0986db38ebc2d6dcc3679d427c9b..a65f3b54e49a3b304e735895f7570e1ef50ee0b6 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mbouzada@gmail.com>, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 13:00+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "Contrasinal"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartiu o cartafol %s con vostede"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartiu o ficheiro %s con vostede"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Sen vista previa dispoñíbel para"
 
-#: templates/public.php:35
+#: 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 3c4f5c565b2349b01ef44063288e2329c337c597..2c02309e78e0da9cffdd78fcfafb8577a02922d7 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <mbouzada@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Non foi posíbel eliminar %s permanente"
 msgid "Couldn't restore %s"
 msgstr "Non foi posíbel restaurar %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "realizar a operación de restauración"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Erro"
 
@@ -40,31 +39,31 @@ msgstr "Erro"
 msgid "delete file permanently"
 msgstr "eliminar o ficheiro permanentemente"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index 6c5d2ee8b43d7694a5bc57419d479ba57127026c..be763534a5e07997e2f4ee918adbb45ac550c79f 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Miguel Branco <mgl.branco@gmail.com>, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 07:10+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\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"
 "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"
@@ -44,11 +40,11 @@ msgstr "produciuse un fallo"
 msgid "File %s could not be reverted to version %s"
 msgstr "Non foi posíbel reverter o ficheiro %s á versión %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Non hai versións antigas dispoñíbeis"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Non foi indicada a ruta"
 
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 27a4cf8757e757ebe17d8c409f1759b088678f22..0925d066e07b9835cc529f205962f1cb912e3b9d 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Miguel Branco <mgl.branco@gmail.com>, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012-2013.
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -21,47 +18,47 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
-msgstr "Configuracións"
+msgstr "Axustes"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP están desactivadas."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados dun en un."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "non foi posíbel determinalo"
 
@@ -71,7 +68,7 @@ msgstr "O aplicativo non está activado"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Produciuse un erro na autenticación"
+msgstr "Produciuse un erro de autenticación"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -97,10 +94,6 @@ msgstr "Estabeleza un nome de usuario administrador"
 msgid "Set an admin password."
 msgstr "Estabeleza un contrasinal de administrador"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Especifique un cartafol de datos."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Non foi posíbel estabelecer a conexión con Oracle"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Produciuse un erro na base de datos: «%s»"
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A orde ofensiva foi: «%s»"
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Omitir este usuario de MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O usuario MySQL «%s»@«%%» xa existe."
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Omitir este usuario de MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>"
@@ -243,19 +240,6 @@ msgstr "último ano"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s está dispoñíbel. Obtéña <a href=\"%s\">máis información</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "actualizado"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "a comprobación de actualizacións está desactivada"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 05a59612fe1b7024c9c1c5f809ed1ac541e83a01..c20ca89cf7f6e659b9d4b6cba422282ebc7f6677 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# antiparvos  <marcoslansgarza@gmail.com>, 2012.
-# <mbouzada@gmail.com>, 2012-2013.
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2012.
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -27,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Non foi posíbel cargar a lista desde a App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Produciuse un erro de autenticación"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "O seu nome visíbel foi cambiado"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Non é posíbel cambiar o nome visíbel"
 
@@ -122,52 +121,52 @@ msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "desfacer"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Non é posíbel retirar o usuario"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupo Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "engadir un grupo"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Debe fornecer un nome de usuario"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Produciuse un erro ao crear o usuario"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -253,7 +252,7 @@ msgstr "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto."
+msgstr "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a través dun sistema de cronjob unha vez por minuto."
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -318,19 +317,19 @@ msgstr "Rexistro"
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +400,7 @@ msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -425,82 +424,74 @@ msgstr "Novo contrasinal"
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Amosar o nome"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "O seu nome visíbel foi cambiado"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Non é posíbel cambiar o seu nome visíbel"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Cambiar o nome visíbel"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nome de acceso"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperación do contrasinal do administrador"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Almacenamento predeterminado"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Sen límites"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Almacenamento"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "cambiar o nome visíbel"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "estabelecer un novo contrasinal"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index bb736687f60a8de6aa9e9be78590227673acdaac..9a807cb786863768d667888fbeac56062e776b19 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# <mbouzada@gmail.com>, 2012-2013.
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013.
-# Miguel Branco, 2012.
+# mbouzada <mbouzada@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -22,6 +18,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Non foi posíbel limpar as asignacións."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Non foi posíbel eliminar a configuración do servidor"
@@ -44,7 +44,7 @@ msgstr "A configuración non é correcta. Vexa o rexistro de ownCloud para máis
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "Fallou o borrado"
+msgstr "Produciuse un fallo ao eliminar"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -58,281 +58,363 @@ msgstr "Manter os axustes?"
 msgid "Cannot add server configuration"
 msgstr "Non é posíbel engadir a configuración do servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "limpadas as asignacións"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Correcto"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "A proba de conexión foi satisfactoria"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "A proba de conexión fracasou"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Confirma que quere eliminar a configuración actual do servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar a eliminación"
 
-#: templates/settings.php:8
+#: 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 "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles."
 
-#: templates/settings.php:11
+#: 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 "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuración do servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Engadir a configuración do servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN base por liña"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN do usuario"
 
-#: templates/settings.php:45
+#: 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 "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de acceso de usuarios"
 
-#: templates/settings.php:53
+#: 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 "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro da lista de usuarios"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar cando se recompilan os grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Axustes da conexión"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuración activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se está sen marcar, omítese esta configuración."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor da copia de seguranza (Réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porto da copia de seguranza (Réplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactivar o servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validación do certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a conexión só funciona con esta opción importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non se recomenda. Só para probas."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tempo de persistencia da caché"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Calquera cambio baleira a caché."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Axustes do directorio"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base da árbore de usuarios"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN base de usuario por liña"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de busca do usuario"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por liña"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base da árbore de grupo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN base de grupo por liña"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de busca do grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asociación de grupos e membros"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de cota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cota predeterminada"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo do correo"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra de nomeado do cartafol do usuario"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome de usuario interno"
+
+#: 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 "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario en ownCloud. Tamén é un porto de URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo do nome de usuario interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Ignorar a detección do UUID"
+
+#: 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 "De xeito predeterminado, ownCloud detecta automaticamente o atributo UUID. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo do UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Asignación do usuario ao «nome de usuario LDAP»"
+
+#: 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 "ownCloud utiliza os nomes de usuario para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Probar a configuración"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index e16010dc69f596348a9ddcbe32b4f701bdd98a61..779cbf82bae6b5b4309115a0dac7f0ec1116729b 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <mbouzada@gmail.com>, 2013.
-#   <mbouzada@gmail.com>, 2012.
-# Miguel Branco, 2012.
-# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013.
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2012
+# Miguel Branco, 2012
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 11:20+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\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"
 "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"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 7c6bc855fd452af2be3c5eeed55f5d1c872b5bd4..36222ee85f23d4ffbd2102d6c764a0ff3b912db0 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dovix Dovix <dovix2003@gmail.com>, 2012.
-# Gilad Naaman <gilad.doom@gmail.com>, 2013.
-#   <ido.parag@gmail.com>, 2012.
-#   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2011-2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -165,75 +161,79 @@ msgstr "דצמבר"
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "לפני דקה אחת"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "לפני {minutes} דקות"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "לפני שעה"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "לפני {hours} שעות"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "לפני {days} ימים"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "לפני {months} חודשים"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "שנים"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "בחירה"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "ביטול"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "לא"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "כן"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "לא"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "בסדר"
 
@@ -298,9 +298,9 @@ msgstr "שיתוף עם קישור"
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "ססמה"
+msgstr "סיסמא"
 
 #: js/share.js:173
 msgid "Email link to person"
@@ -401,24 +401,27 @@ msgstr "איפוס הססמה של ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "איפוס שליחת דוא״ל."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "הבקשה נכשלה!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "שם משתמש"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "בקשת איפוס"
 
@@ -468,7 +471,7 @@ msgstr "ענן לא נמצא"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "עריכת הקטגוריות"
+msgstr "ערוך קטגוריות"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -481,7 +484,7 @@ msgstr "אזהרת אבטחה"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
@@ -524,75 +527,80 @@ msgstr "מתקדם"
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "מרחב הכתובות של מסד הנתונים"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "שירותי רשת בשליטתך"
+msgstr "שירותי רשת תחת השליטה שלך"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "התנתקות"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "בקשת הכניסה האוטומטית נדחתה!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "אם לא שינית את ססמתך לאחרונה, יתכן שחשבונך נפגע!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "נא לשנות את הססמה שלך כדי לאבטח את חשבונך מחדש."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "שמירת הססמה"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "כניסה"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "כניסות אלטרנטיביות"
 
diff --git a/l10n/he/files.po b/l10n/he/files.po
index f22b2dcd8316aec1cf5d7a9e0b52540d33e99649..1fdea3414068f912d00dab8a6ebf25e46cd7b823 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dovix Dovix <dovix2003@gmail.com>, 2012.
-#   <ido.parag@gmail.com>, 2012.
-#   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -31,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "לא אירעה תקלה, הקבצים הועלו בהצלחה"
+msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,19 +44,19 @@ msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגד
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "הקובץ שהועלה חרג מההנחיה MAX_FILE_SIZE שצוינה בטופס ה־HTML"
+msgstr "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "הקובץ שהועלה הועלה בצורה חלקית"
+msgstr "הקובץ הועלה באופן חלקי בלבד"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "לא הועלו קבצים"
+msgstr "שום קובץ לא הועלה"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "תיקייה זמנית חסרה"
+msgstr "תקיה זמנית חסרה"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -82,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "קבצים"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "שתף"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "החלפה"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "הצעת שם"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ביטול"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "קובץ אחד נשלח"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "קישור אינו יכול להיות ריק."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} קבצים"
 
+#: 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 "העלאה"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
 
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 2c26e96cd12132ba40a314695fb7e2851af74528..d2120666022fa83e4b6e2403dbbe2c388633515a 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Gilad Naaman <gilad.doom@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "שמירה…"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "כלום"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 280d2348b8f3623286b101d746f2a5738fc26c58..3b0478cada5203e3696484aab3c01a084897bf83 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -39,19 +37,26 @@ msgstr "נא לספק קוד יישום וסוד תקניים של Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
 
-#: lib/config.php:423
+#: 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:426
+#: 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 "אחסון חיצוני"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 2ccef5f2b52c0028b2f5464c4a007fb28f8eea5a..5428e9f8756e6eba5430010cc9028c77c08ed9ce 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-10 02:04+0200\n"
-"PO-Revision-Date: 2012-10-09 11:45+0000\n"
-"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\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"
 "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,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "ססמה"
+msgstr "סיסמא"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr "שליחה"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s שיתף עמך את התיקייה %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s שיתף עמך את הקובץ %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "אין תצוגה מקדימה זמינה עבור"
 
-#: templates/public.php:35
+#: 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 4ec7b23ec83d4347c766726ac8330ccd5ba2fa5f..fd7ab0c664957b617eb2378018db805b03a4ef8e 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Gilad Naaman <gilad.doom@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "בלתי אפשרי למחוק את %s לצמיתות"
 msgid "Couldn't restore %s"
 msgstr "בלתי אפשרי לשחזר את %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "בצע פעולת שחזור"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "שגיאה"
 
@@ -40,31 +39,31 @@ msgstr "שגיאה"
 msgid "delete file permanently"
 msgstr "מחק קובץ לצמיתות"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "שם"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "נמחק"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} קבצים"
 
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 171a23cbc9ee79526a1ec40d9aafc08e0ec099f8..b6e191d2379942510285f611ee43e60130456d83 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -42,17 +40,17 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 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"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 5c8076308031edc62d470fc19bff39be3862f8f2..f68ebafe3196a73a07161d0b78ee9b44a15e628d 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,47 +17,47 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "עזרה"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "אישי"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "הגדרות"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "משתמשים"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "יישומים"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "מנהל"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "הורדת ZIP כבויה"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "חזרה לקבצים"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "הקבצים הנבחרים גדולים מידי ליצירת קובץ zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -95,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -241,19 +239,6 @@ msgstr "שנה שעברה"
 msgid "years ago"
 msgstr "שנים"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s זמין. קבלת <a href=\"%s\">מידע נוסף</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "עדכני"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "בדיקת עדכונים מנוטרלת"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 4597abdc41783f5bd96e5756fe62b0956c5bbc2c..3022e30dc04d97ba9c25dec1a771e94f96d0200d 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Gilad Naaman <gilad.doom@gmail.com>, 2012.
-#   <ido.parag@gmail.com>, 2012.
-#   <tomerc+transifex.net@gmail.com>, 2011.
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "לא ניתן לטעון רשימה מה־App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "שגיאת הזדהות"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr "בטל"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "הפעל"
+msgstr "הפעלה"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -120,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "שומר.."
+msgstr "שמירה…"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "ביטול"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "קבוצות"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "מנהל הקבוצה"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "עברית"
 
@@ -310,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "יומן"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +399,9 @@ msgstr "השג את האפליקציות על מנת לסנכרן את הקבצ
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
-msgstr "ססמה"
+msgstr "סיסמא"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -423,82 +423,74 @@ msgstr "ססמה חדשה"
 msgid "Change password"
 msgstr "שינוי ססמה"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "דוא״ל"
+msgstr "דואר אלקטרוני"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "כתובת הדוא״ל שלך"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "פה"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "יצירה"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 1a0fa0395458d0d07908ffaaa9ba1cf96da93bbd..c13ba23bce584363d1e1bbcdc74631242fe0f678 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Gilad Naaman <gilad.doom@gmail.com>, 2013.
+# 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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -48,287 +52,369 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "האם לשמור את ההגדרות?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
+msgstr "לא ניתן להוסיף את הגדרות השרת"
+
+#: js/settings.js:111
+msgid "mappings cleared"
 msgstr ""
 
-#: js/settings.js:121
-msgid "Connection test succeeded"
+#: js/settings.js:112
+msgid "Success"
 msgstr ""
 
-#: js/settings.js:126
+#: 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 ""
+msgstr "בדיקת החיבור נכשלה"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "האם אכן למחוק את הגדרות השרת הנוכחיות?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "אישור המחיקה"
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "הגדרות השרת"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "הוספת הגדרות השרת"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "מארח"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN משתמש"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "סיסמא"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "לגישה אנונימית, השאר את הDM והסיסמא ריקים."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "סנן כניסת משתמש"
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "סנן רשימת משתמשים"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "סנן קבוצה"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "פורט"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "בשניות. שינוי מרוקן את המטמון."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "בבתים"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "עזרה"
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index 65a279ed44f5a506b730b55bc449bc9d3bc19cbf..43d52925cb34a8ca1d0f5ade8032549db70e5f02 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index f43d7de3b526e2a3da9c5672ba2b01904788107f..2209ac116e606d615b7aaa13c2b307fe330ae6ad 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Omkar Tapale <omkar_tapale@live.com>, 2012.
-# Sanjay Rabidas <rabidassanjay@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:00+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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -162,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -239,8 +241,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
@@ -293,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "पासवर्ड"
 
@@ -396,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|"
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: 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:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -519,37 +526,37 @@ msgstr "उन्नत"
 msgid "Data folder"
 msgstr "डाटा फोल्डर"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "डेटाबेस कॉन्फ़िगर करें "
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "डेटाबेस उपयोगकर्ता"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "डेटाबेस पासवर्ड"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "डेटाबेस का नाम"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
@@ -557,37 +564,42 @@ msgstr "सेटअप समाप्त करे"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "लोग  आउट"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "याद रखें"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 77fc1856685e014878e136fcaa1a14859c6f2af8..4fbd84f19965309069a6cd6dd067e588cc20edf5 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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 94768da1fcc82e1d63b9dfbd2d662c3d1efe9bc3..1b6ebe3c0011efdfd09ab047fcf50ca349696af8 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index b4d9abc7e762eb9a1d0fc085da820612283ffd6c..d437731724ffd6e87e8f30f0600e050c42d6df16 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 65e94288b4225b803bf309aa93399bf2796a9e92..5a9ccbc09ed3e65099c29dca598aea4315f0a1d3 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "पासवर्ड"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index f5adaa2e8cb495f48a240c8f4017c8d9026fb64b..6c057b0c2402e715a3f58e6917d2f31aae8a6a3b 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index c58f10c16c61adcf67ab9cf5f5efa5e5af9c6094..e3697cd4513dd004f6dc0db1f76dbddbcb41030e 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index a47a99102b3a613f089a575e02e8fead4717e788..7712ebdf65ba99aeca2ee7c7a92a87fef26eaabe 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "सहयोग"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "यक्तिगत"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 0ef36ef7266b1c54d577e2d9d89e96769cc23ecb..c81fb256e3b3a4c45de1eb1ba97b3cff0a244857 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "पासवर्ड"
 
@@ -419,82 +423,74 @@ msgstr "नया पासवर्ड"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index b2f6a9761a59b3882ce94e2a43039315ea9825a9..2bcde19cb2951cfe25c183b47370135a165fb515 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "पासवर्ड"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "सहयोग"
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index cc71e94d7f6eab442e509a45b044090240a97617..712626e49c00d2cf6fc0f413d0e5dbf3083e65f9 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 8d9dbcea6ef549806463ddda77117fdcf5bf1b5f..ffb5cda05b73f3a28f96a0c9a471df6ed44be170 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
-# Domagoj Delimar <transifex.net@domdelimar.com>, 2012.
-#   <franz@franz-net.info>, 2012.
-# Thomas Silađi <thomas.siladi@net.hr>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +73,7 @@ msgstr ""
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Nema odabranih kategorija za brisanje."
+msgstr "Niti jedna kategorija nije odabrana za brisanje."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -164,75 +160,79 @@ msgstr "Prosinac"
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "godina"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Izaberi"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Odustani"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ne"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "U redu"
 
@@ -247,7 +247,7 @@ msgstr ""
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr "Pogreška"
+msgstr "Greška"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -297,7 +297,7 @@ msgstr "Djeli preko link-a"
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
@@ -400,24 +400,27 @@ msgstr "ownCloud resetiranje lozinke"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Koristite ovaj link da biste poništili lozinku: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Zahtjev za resetiranjem"
 
@@ -517,43 +520,43 @@ msgstr "Stvori <strong>administratorski račun</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "Dodatno"
+msgstr "Napredno"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "će se koristiti"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Poslužitelj baze podataka"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
@@ -561,37 +564,42 @@ msgstr "Završi postavljanje"
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "zapamtiti"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 832a52920aa1887da2e18783cf245cb1c6c5c064..972d46958a1636bb5772a03d597b11d8e6ea6909 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
-#   <franz@franz-net.info>, 2012.
-# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -30,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "Datoteka je poslana uspješno i bez pogrešaka"
+msgstr "Nema pogreške, datoteka je poslana uspješno."
 
 #: ajax/upload.php:27
 msgid ""
@@ -51,19 +44,19 @@ msgstr ""
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
+msgstr "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Datoteka je poslana samo djelomično"
+msgstr "Poslana datoteka je parcijalno poslana"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Ni jedna datoteka nije poslana"
+msgstr "Datoteka nije poslana"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Nedostaje privremena mapa"
+msgstr "Nedostaje privremeni direktorij"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -81,57 +74,61 @@ msgstr ""
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Podijeli"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "Briši"
+msgstr "Obriši"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 datoteka se učitava"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "datoteke se učitavaju"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -155,72 +152,80 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Greška"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Naziv"
+msgstr "Ime"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Pošalji"
+msgstr "Učitaj"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -278,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Preuzmi"
+msgstr "Preuzimanje"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Prekini djeljenje"
+msgstr "Makni djeljenje"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
 
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index 434831e8abeb6c88e8cee096b634ed14bc238bc3..bbff99c9b09dee8f767809a810488a7001b8159d 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Spremanje..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index ff1ac7f575f1c012224152486feb04cab39e4bc2..6d9da77d95c67bc31b4486a319ff656badaa8d88 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 90582fb7374e81e87828adaefee5649ac21f8b23..e6b5a7e3756f6fdd52c548c41333cda10d51b1b1 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Lozinka"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Pošalji"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Preuzimanje"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "web usluge pod vašom kontrolom"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index 5d8da1644946e17bb94d7e6a6a8610651dc0f2ea..533e3e43ed2fde4c1673ea2a3c801273d9a7305c 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Greška"
 
@@ -39,31 +39,31 @@ msgstr "Greška"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 95d4715bd686ac82c9c1c1076e7dfcedc1988c42..4a55674bbd9ead0a18689f4335a0c1497a627fd7 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 9f53f454677ff2d184d1e33b73dedfcb4d644732..018c77a5a856b0f845d46df4adca303c52ef97f7 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Osobno"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Postavke"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "Aplikacije"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr "prošlu godinu"
 msgid "years ago"
 msgstr "godina"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 3269cfa11cdbe8ed66bf03f923a463e0bf351716..0aa248f1b26ea74a947633e60b7adcf939d1e088 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Davor Kustec <dkustec@gmail.com>, 2011, 2012.
-#   <franz@franz-net.info>, 2012.
-# Thomas Silađi <thomas.siladi@net.hr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nemogićnost učitavanja liste sa Apps Stora"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Greška kod autorizacije"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -119,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "vrati"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -234,7 +235,7 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
@@ -309,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "dnevnik"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "više"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Lozinka"
 
@@ -422,82 +423,74 @@ msgstr "Nova lozinka"
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Vaša e-mail adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Izradi"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index fbc304add5da3d691768fb480edaf432acb7ac2c..450e358e9f41ba499165d4817902b459d9bfbf70 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Greška"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Lozinka"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index d33ff57a3a1763eb0c235f91e4d2126b790f74f7..bc4382e068d2a2e4902dd952ddfac80118348c2d 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 5640290395d43c2f592ad81966d80a9e3522a4ce..057f49061807eeb508437099bfb4f06739080f0a 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adam Toth <adazlord@gmail.com>, 2012.
-# Laszlo Tornoci <torlasz@gmail.com>, 2013.
-#   <mail@tamas-nagy.net>, 2011.
-# Peter Borsa <peter.borsa@gmail.com>, 2012.
-# Tamas Nagy <mail@tamas-nagy.net>, 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -165,75 +161,79 @@ msgstr "december"
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 órája"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} órája"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} hónapja"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "több éve"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Válasszon"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Mégse"
+msgstr "Mégsem"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nem"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Igen"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nem"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -298,7 +298,7 @@ msgstr "Link megadásával osztom meg"
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Jelszó"
 
@@ -401,24 +401,27 @@ msgstr "ownCloud jelszó-visszaállítás"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Használja ezt a linket a jelszó ismételt beállításához: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról."
+#: 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 "Emailben fog kapni egy linket, amivel új jelszót tud majd beállítani magának. <br>Ha a levél nem jött meg, holott úgy érzi, hogy már meg kellett volna érkeznie, akkor ellenőrizze a spam/levélszemét mappáját. <br>Ha ott sincsen, akkor érdeklődjön a rendszergazdánál."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Elküldtük az emailt a jelszó ismételt beállításához."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Nem sikerült a kérést teljesíteni!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Visszaállítás igénylése"
 
@@ -432,7 +435,7 @@ msgstr "A bejelentkező ablakhoz"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Új jelszó"
+msgstr "Az új jelszó"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -452,7 +455,7 @@ msgstr "Alkalmazások"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Adminisztráció"
+msgstr "Adminsztráció"
 
 #: strings.php:9
 msgid "Help"
@@ -524,37 +527,37 @@ msgstr "Haladó"
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "adatbázist fogunk használni"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Az adatbázis neve"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Az adatbázis táblázattér (tablespace)"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "A beállítások befejezése"
 
@@ -562,37 +565,42 @@ msgstr "A beállítások befejezése"
 msgid "web services under your control"
 msgstr "webszolgáltatások saját kézben"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Kilépés"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Az automatikus bejelentkezés sikertelen!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Ha mostanában nem módosította a jelszavát, akkor lehetséges, hogy idegenek jutottak be a rendszerbe az Ön nevében!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "A biztonsága érdekében változtassa meg a jelszavát!"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Elfelejtette a jelszavát?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "emlékezzen"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternatív bejelentkezés"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 1194d9e1c2d1dce5f9326945d9a80e272ef7ff3d..ac39b2cd630e3fa0b2aa0a695fc91b0876caf531 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adam Toth <adazlord@gmail.com>, 2012.
-# Akos <nagy.akos@libreoffice.ro>, 2013.
-#  <gyonkibendeguz@gmail.com>, 2013.
-#   <gyonkibendeguz@gmail.com>, 2013.
-# Laszlo Tornoci <torlasz@gmail.com>, 2013.
-#   <mail@tamas-nagy.net>, 2011.
-# Peter Borsa <peter.borsa@gmail.com>, 2011.
+# 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 13:10+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -34,10 +28,6 @@ msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a név
 msgid "Could not move %s"
 msgstr "Nem sikerült %s áthelyezése"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nem lehet átnevezni a fájlt"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
@@ -63,7 +53,7 @@ msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Nem töltődött fel semmi"
+msgstr "Nem töltődött fel állomány"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -85,55 +75,59 @@ msgstr "Érvénytelen mappa."
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Megosztás"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "írjuk fölül"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "legyen más neve"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "a törlés végrehajtása"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fájl töltődik föl"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "fájl töltődik föl"
 
@@ -159,69 +153,77 @@ msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhat
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nincs elég szabad hely"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Hiba"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fájl"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Érvénytelen mappanév. A 'Shared' az ownCloud számára fenntartott elnevezés"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nem lehet átnevezni a fájlt"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Feltöltés"
@@ -282,37 +284,37 @@ msgstr "Törölt fájlok"
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Itt nincs írásjoga."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Megosztás visszavonása"
+msgstr "A megosztás visszavonása"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
 
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 4ad1f0108e8447c261442a1b225a57f90d2f4a60..643b0404816a55811ce9a01a9c9f5d2ece8d3470 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Akos <nagy.akos@libreoffice.ro>, 2013.
-# Csaba Orban <vicsabi@gmail.com>, 2012.
-#  <gyonkibendeguz@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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 14:00+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
 "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"
@@ -21,22 +17,87 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Mentés..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Az állományok titkosítása be van kapcsolva."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "A következő fájltípusok nem kerülnek titkosításra:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Zárjuk ki a titkosításból a következő fájltípusokat:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Egyik sem"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 256bc81c4db6765afa7f7c0f36fbba0b8eac0561..bc36606bcabb8b220f7877cc68b129279a5e07d2 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Laszlo Tornoci <torlasz@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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +38,26 @@ msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!"
 msgid "Error configuring Google Drive storage"
 msgstr "A Google Drive tárolót nem sikerült beállítani"
 
-#: lib/config.php:423
+#: 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 "<b>Figyelem:</b> az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot."
 
-#: lib/config.php:426
+#: 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 "<b>Figyelem:</b> a PHP FTP támogatása vagy nincs telepítve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot."
 
+#: 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 "<b>Figyelmeztetés:</b> A PHP-ben nincs telepítve vagy engedélyezve a Curl támogatás. Nem lehetséges ownCloud / WebDAV ill. GoogleDrive tárolók becsatolása. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot!"
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Külső tárolási szolgáltatások becsatolása"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 0534ea09d439963f900e0127891c5ec5558f5318..66718ac0b98a1476b8054f26f8acf77e9ad21896 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Csaba Orban <vicsabi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:39+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Jelszó"
 msgid "Submit"
 msgstr "Elküld"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s megosztotta Önnel ezt a mappát: %s"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s megosztotta Önnel ezt az állományt: %s"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nem áll rendelkezésre előnézet ehhez: "
 
-#: templates/public.php:43
+#: 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 c035242eb2c8df8689a02f7c1347ad931e73ee38..aa6a6bb38b425670006654a00a3f12d3347b5255 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Akos <nagy.akos@libreoffice.ro>, 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Nem sikerült %s végleges törlése"
 msgid "Couldn't restore %s"
 msgstr "Nem sikerült %s visszaállítása"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "a visszaállítás végrehajtása"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Hiba"
 
@@ -41,31 +39,31 @@ msgstr "Hiba"
 msgid "delete file permanently"
 msgstr "az állomány végleges törlése"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Név"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Törölve"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} fájl"
 
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index f166ccc2e3591f9e45106545d2381474ba713c90..39f58c0a5db318e40a101cdbac1166893fd5bb7c 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -41,11 +40,11 @@ msgstr "nem sikerült"
 msgid "File %s could not be reverted to version %s"
 msgstr "%s állományt nem sikerült átállítani erre a változatra: %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Nincs régebbi változat"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nincs megadva az útvonal"
 
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index f82cf57021b06649d8d1ff0d799c78dce5684e6c..2f355db533b22d352745e4ed93add3ed175ffed8 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adam Toth <adazlord@gmail.com>, 2012.
-#  <gyonkibendeguz@gmail.com>, 2013.
-# Laszlo Tornoci <torlasz@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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -20,47 +18,47 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Súgó"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Személyes"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Beállítások"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Felhasználók"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Alkalmazások"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Adminsztráció"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letöltés nincs engedélyezve."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "A fájlokat egyenként kell letölteni."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Vissza a Fájlokhoz"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "A kiválasztott fájlok túl nagyok a zip tömörítéshez."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nem határozható meg"
 
@@ -70,7 +68,7 @@ msgstr "Az alkalmazás nincs engedélyezve"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Hitelesítési hiba"
+msgstr "Azonosítási hiba"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -96,10 +94,6 @@ msgstr "Állítson be egy felhasználói nevet az adminisztrációhoz."
 msgid "Set an admin password."
 msgstr "Állítson be egy jelszót az adminisztrációhoz."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Adja meg az adatokat tartalmazó könyvtár nevét."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,79 +114,83 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 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:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Az Oracle kapcsolat nem hozható létre"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Adatbázis hiba: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A hibát ez a parancs okozta: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Törölje ezt a felhasználót a MySQL-ből"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Törölje ezt a felhasználót a MySQL-ből."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, 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:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "másodperce"
+msgstr "pár másodperce"
 
 #: template.php:114
 msgid "1 minute ago"
@@ -240,20 +238,7 @@ msgstr "tavaly"
 
 #: template.php:124
 msgid "years ago"
-msgstr "éve"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s elérhető. <a href=\"%s\">További információ</a>."
-
-#: updater.php:81
-msgid "up to date"
-msgstr "a legfrissebb változat"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "A frissitések ellenőrzése nincs engedélyezve."
+msgstr "több éve"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 8d9d0e1c0f5b64e85ab17d6cd75b70ff02f6b9ee..3eae903f150757f0c5cfcd6b35cd34bdf9a330ea 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adam Toth <adazlord@gmail.com>, 2012.
-#   <gyonkibendeguz@gmail.com>, 2013.
-# Laszlo Tornoci <torlasz@gmail.com>, 2013.
-# Peter Borsa <peter.borsa@gmail.com>, 2011.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -25,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nem tölthető le a lista az App Store-ból"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Azonosítási hiba"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Az Ön megjelenítési neve megváltozott."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Nem sikerült megváltoztatni a megjelenítési nevet"
 
@@ -98,7 +99,7 @@ msgstr "Letiltás"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Engedélyezés"
+msgstr "engedélyezve"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -120,52 +121,52 @@ msgstr "Hiba történt a programfrissítés közben"
 msgid "Updated"
 msgstr "Frissítve"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "törölve"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "A felhasználót nem sikerült eltávolítáni"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Csoportok"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Csoportadminisztrátor"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "csoport hozzáadása"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Érvényes felhasználónevet kell megadnia"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "A felhasználó nem hozható létre"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -316,19 +317,19 @@ msgstr "Naplózás"
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +400,7 @@ msgstr "Töltse le az állományok szinkronizációjához szükséges programoka
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Jelszó"
 
@@ -423,82 +424,74 @@ msgstr "Az új jelszó"
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "A megjelenített név"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Az Ön megjelenítési neve megváltozott"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Nem sikerült megváltoztatni az Ön megjelenítési nevét"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "A megjelenítési név módosítása"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Bejelentkezési név"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Létrehozás"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "A jelszóvisszaállítás adminisztrációja"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Alapértelmezett tárhely"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Korlátlan"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Más"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Tárhely"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "a megjelenített név módosítása"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "új jelszó beállítása"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index d7f7177ba7548424e3fe9d730fefbb9488d85b18..7cdac13a90d2dea5485c2a3b30b3db4dbf44272c 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <gyonkibendeguz@gmail.com>, 2013.
-# Laszlo Tornoci <torlasz@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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -19,6 +18,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Nem sikerült törölni a hozzárendeléseket."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Nem sikerült törölni a kiszolgáló konfigurációját"
@@ -55,281 +58,363 @@ msgstr "Tartsuk meg a beállításokat?"
 msgid "Cannot add server configuration"
 msgstr "Az új  kiszolgáló konfigurációja nem hozható létre"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Töröltük a hozzárendeléseket"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sikeres végrehajtás"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Hiba"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "A kapcsolatellenőrzés eredménye: sikerült"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "A kapcsolatellenőrzés eredménye: nem sikerült"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Tényleg törölni szeretné a kiszolgáló beállításait?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "A törlés megerősítése"
 
-#: templates/settings.php:8
+#: 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 "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket."
 
-#: templates/settings.php:11
+#: 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 "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "A kiszolgálók beállításai"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Új kiszolgáló beállításának hozzáadása"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Kiszolgáló"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN-gyökér"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Soronként egy DN-gyökér"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "A kapcsolódó felhasználó DN-je"
 
-#: templates/settings.php:45
+#: 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 "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Szűrő a bejelentkezéshez"
 
-#: templates/settings.php:53
+#: 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 "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "A felhasználók szűrője"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Ez a szűrő érvényes a felhasználók listázásakor."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "A csoportok szűrője"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ez a szűrő érvényes a csoportok listázásakor."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Kapcsolati beállítások"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "A beállítás aktív"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ha nincs kipipálva, ez a beállítás kihagyódik."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Másodkiszolgáló (replika)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "A másodkiszolgáló (replika) portszáma"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "A fő szerver kihagyása"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Ha ezt bekapcsoljuk, akkor az ownCloud csak a másodszerverekhez kapcsolódik."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Használjunk TLS-t"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Ne ellenőrizzük az SSL-tanúsítvány érvényességét"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát az ownCloud kiszolgálóra!"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nem javasolt, csak tesztelésre érdemes használni."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "A gyorsítótár tárolási időtartama"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "másodpercben. A változtatás törli a cache tartalmát."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Címtár beállítások"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "A felhasználónév mezője"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Ebből az LDAP attribútumból képződik a felhasználó elnevezése, ami megjelenik az ownCloudban."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "A felhasználói fa gyökere"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "A felhasználók lekérdezett attribútumai"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Nem kötelező megadni, soronként egy attribútum"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "A csoport nevének mezője"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Ebből az LDAP attribútumból képződik a csoport elnevezése, ami megjelenik az ownCloudban."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "A csoportfa gyökere"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "A csoportok lekérdezett attribútumai"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "A csoporttagság attribútuma"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Különleges attribútumok"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kvóta mező"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Alapértelmezett kvóta"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bájtban"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Email mező"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "A home könyvtár elérési útvonala"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Belső felhasználónév"
+
+#: 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 "A belső felhasználónév attribútuma:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Az UUID-felismerés felülbírálása"
+
+#: 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 "UUID attribútum:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
+
+#: 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 "A felhasználó - LDAP felhasználó hozzárendelés törlése"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "A csoport - LDAP csoport hozzárendelés törlése"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "A beállítások tesztelése"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Súgó"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index f661c0e4ee09620d95371022845b7d1f85137f44..e2056a92cafd5c64f9755143b6903ccc71cf746d 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Akos <nagy.akos@libreoffice.ro>, 2013.
+# akoscomp <nagy.akos@libreoffice.ro>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-29 00:04+0100\n"
-"PO-Revision-Date: 2013-01-28 11:27+0000\n"
-"Last-Translator: akoscomp <nagy.akos@libreoffice.ro>\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"
 "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"
@@ -26,7 +26,7 @@ msgstr "WebDAV hitelesítés"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 868a6e0e91c3950b3ad24df3b04694fbaf70b6bb..e738115c1e43b4714c6813bdda144cc03e517bdd 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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: 2012-10-18 02:03+0200\n"
-"PO-Revision-Date: 2012-10-18 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "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"
@@ -17,201 +17,382 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
-msgid "Application name not provided."
+#: ajax/share.php:97
+#, php-format
+msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/vcategories/add.php:29
+#: 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"
+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:36
-msgid "This category already exists: "
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
 msgstr ""
 
-#: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
-msgid "Settings"
+#: 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 ""
 
-#: js/js.js:670
-msgid "January"
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
 msgstr ""
 
-#: js/js.js:670
-msgid "February"
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
 msgstr ""
 
-#: js/js.js:670
-msgid "March"
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
 msgstr ""
 
-#: js/js.js:670
-msgid "April"
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:670
+#: 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 ""
+msgstr "Õ„Õ¡ÕµÕ«Õ½"
 
-#: js/js.js:670
+#: js/config.php:50
 msgid "June"
-msgstr ""
+msgstr "Õ€Õ¸Ö‚Õ¶Õ«Õ½"
 
-#: js/js.js:671
+#: js/config.php:51
 msgid "July"
-msgstr ""
+msgstr "Õ€Õ¸Ö‚Õ¬Õ«Õ½"
 
-#: js/js.js:671
+#: js/config.php:52
 msgid "August"
-msgstr ""
+msgstr "Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½"
 
-#: js/js.js:671
+#: js/config.php:53
 msgid "September"
-msgstr ""
+msgstr "Սեպտեմբեր"
 
-#: js/js.js:671
+#: js/config.php:54
 msgid "October"
-msgstr ""
+msgstr "Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/js.js:671
+#: js/config.php:55
 msgid "November"
-msgstr ""
+msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/js.js:671
+#: 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/oc-dialogs.js:123
+#: 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:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:159
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
-#: js/oc-vcategories.js:68
-msgid "No categories selected for deletion."
+#: 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:68 js/share.js:114 js/share.js:121 js/share.js:497
-#: js/share.js:509
+#: 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/share.js:103
+#: 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 ""
+
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:114
+#: js/share.js:136
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:121
+#: js/share.js:143
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:130
+#: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:132
+#: js/share.js:154
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:137
+#: js/share.js:159
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:164
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:167
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:42 templates/login.php:24
-#: templates/verify.php:13
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
-#: js/share.js:152
+#: 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:153
+#: js/share.js:179
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:185
+#: js/share.js:211
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:213
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:250
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:283
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:285
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:288
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:291
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:294
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:322 js/share.js:484
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:497
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:509
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: lostpassword/index.php:26
+#: 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:48
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -219,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Requested"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Login failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -288,116 +472,135 @@ msgstr ""
 msgid "Edit categories"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:14
+#: templates/edit_categories_dialog.php:16
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
 msgid "Security Warning"
 msgstr ""
 
-#: templates/installation.php:24
+#: 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:26
+#: 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:32
+#: 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 ""
-"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."
+"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:36
+#: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:48
+#: templates/installation.php:62
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:64
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:57
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: 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:105
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:109
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:127
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:132
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:40
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:34
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:8
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:9
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:15
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:27
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:28
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/logout.php:1
-msgid "You are logged out."
+#: templates/login.php:47
+msgid "Alternative Logins"
 msgstr ""
 
 #: templates/part.pagenavi.php:3
@@ -408,16 +611,7 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index a68a0138b830bf26fc994407f6ff2a57451fcf62..eb1ce560470a0db368446ccf86caa562af759042 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
-"Language-Team: LANGUAGE <LL@li.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 00b039ad399c5eaf5dd486c1df8f5be957b6318c..a16e27d574b2426a99de18a5d3ee53f55d8e4a81 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,28 +7,97 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 6563d686916bf5dc7f221e5cfc54fb5ad9844200..fb45b44723a0bbcc392afde909a7a2802b45edfa 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 8d83b7805c5267406e9a25b4c94b207ec27eb05f..a784afbf6b3321b99f1c6c3e1aa5519023341179 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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "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"
@@ -23,26 +23,26 @@ msgstr ""
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Õ€Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Ô²Õ¥Õ¼Õ¶Õ¥Õ¬"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: 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 110ce8444ccb064a7d88a91acaddae5402be729e..74dcd02188eef30788a0ba91b53a1523abd94de0 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
-"Language-Team: LANGUAGE <LL@li.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"
+"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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr ""
 
@@ -39,31 +39,31 @@ msgstr ""
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
index 4caf1f1827149828dfd5894450265a0ca905dbd9..7e959a096a38c80a81b2db21cd4890ab1fbac83d 100644
--- a/l10n/hy/files_versions.po
+++ b/l10n/hy/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,41 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
+#: history.php:40
+msgid "success"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
+#: 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 ""
 
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: history.php:74
+msgid "No path specified"
 msgstr ""
 
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:6
+msgid "Versions"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Enable"
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
 msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index a6359330b340cf390a2b6652c37be07d9fabed51..a40365032ad76706041240c55d5b192dea0346b0 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,61 +7,65 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:288
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:295
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:300
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:305
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:312
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:314
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:280
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:281
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:281 files.php:306
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:305
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:63 json.php:75
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -69,57 +73,173 @@ msgstr ""
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: template.php:86
+#: 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:132 setup.php:329 setup.php:374
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:238
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:237
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:309
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:314
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:315
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:644
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:867
+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
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:87
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:88
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:91
+#: 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:92
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:93
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:94
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:95
-msgid "months ago"
+#: template.php:122
+#, php-format
+msgid "%d months ago"
 msgstr ""
 
-#: template.php:96
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:97
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
-#: updater.php:66
+#: vcategories.php:188 vcategories.php:249
 #, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:68
-msgid "up to date"
-msgstr ""
-
-#: updater.php:71
-msgid "updates check is disabled"
+msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 170d774b3cddab45c295db55cbb9cf6e58c0c57f..2c73b731876a81b6c75e58cecd06a098d12d261c 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\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"
-"Language-Team: LANGUAGE <LL@li.org>\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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Ô±ÕµÕ¬"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 438a2108b76873cf9c642095ab8dd9b49d3eb9ab..b85c44b15c33bbbef6e7cee629bd2a9a3b960ad7 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,164 +7,413 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:8
+#: 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:8
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: 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:10
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: 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:11
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: 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:12
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: 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:18
-msgid "Base User Tree"
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:19
-msgid "Base Group Tree"
+#: 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:20
-msgid "Group-Member association"
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:21
+#: 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:21
-msgid "Do not use it for SSL connections, it will fail."
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: 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:23
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: 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:24
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: 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:25
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: 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:29
-msgid "in seconds. A change empties the cache."
+#: templates/settings.php:95
+msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:30
+#: 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:32
+#: 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/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..101ab76c34c2176353c5a8be5146ac2720bde3ea
--- /dev/null
+++ b/l10n/hy/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: http://"
+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/ia/core.po b/l10n/ia/core.po
index a43d57ba72e1d9e1f33d20b43b32397132ac48ef..b557f15f69bfbc42d49cca865f754b18201eca0a 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:12+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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -238,11 +241,13 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
+msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -292,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -302,7 +307,7 @@ msgstr ""
 
 #: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Invia"
 
 #: js/share.js:178
 msgid "Set expiration date"
@@ -395,24 +400,27 @@ msgstr "Reinitialisation del contrasigno de ownCLoud"
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nomine de usator"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Requestar reinitialisation"
 
@@ -518,37 +526,37 @@ msgstr "Avantiate"
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "essera usate"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -556,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Clauder le session"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "memora"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Aperir session"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index ad9b1aea1338cafeb36e1d76be5b87fdfdbb12ba..f95c026aa11b66e8dabb429f9b630562dcb49ced 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
-# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -29,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -58,7 +52,7 @@ msgstr "Le file incargate solmente esseva incargate partialmente"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Nulle file esseva incargate"
+msgstr "Nulle file esseva incargate."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -80,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Deler"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -154,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Incargar"
@@ -277,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 11e4cc8eb8c110820bbd50fae6ad4953bda41c17..37c50e27483802edd10801e53d22e4bd2596e454 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index e79169bb213912f7531c2dc92ba30332fa479c4c..4971a7cae94d67aecb6c0ee4e5b05d8fa12616d0 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 05ecbbb1465ee3711b9e947fa92868a991cdaf04..19200562667e598f74a6fe465f8c4ea360821d1d 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Contrasigno"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Submitter"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Discargar"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "servicios web sub tu controlo"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 8ac8c8f293c1fd0e52ac0fd886097ed9e3d62e8c..6712fe19cae3f17fd157ad0f183dfc5a70719ecb 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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -27,43 +27,43 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nomine"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index 400157adb8f57fcc68a26bbac5377d214bc9fbd8..0e666b6dc57525ae7e5c92f376f35aa799229dda 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index c61f3e4c679ac8d3ca52c37b4aa90b8ba2cf3660..1d8995e1c7187cbfb85b0b225f6193cf158d1663 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Adjuta"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Configurationes"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usatores"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "Applicationes"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 1c72de58d92b3099408e5ec4ef9bc7b3929c393e..e8e884bc8c6f895927d11f3d4a4bdd06608f118d 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Emilio Sepúlveda <djfunkinmixer@gmail.com>, 2011.
-# Emilio Sepúlveda <emisepulvedam@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:09+0200\n"
-"PO-Revision-Date: 2013-04-10 10:00+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -104,7 +106,7 @@ msgstr ""
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: js/apps.js:90
 msgid "Updating...."
@@ -118,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Gruppos"
 
-#: js/users.js:91 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Deler"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -308,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Registro"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "Plus"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -397,7 +399,7 @@ msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -421,82 +423,74 @@ msgstr "Nove contrasigno"
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Linguage"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 602cde8f9a6ae544b591aa8b8d911182c86ca937..06eda6fd303f475fc57a065583c44124736dfd77 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Contrasigno"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Adjuta"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index cee575b438123314fd332bbe4482b13e3f9eca1a..a91b0b25c8cb31448ba31d2270ed007531f51417 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/id/core.po b/l10n/id/core.po
index d84472d76cfbc6b6849890581ffe4d8063a0914d..00c5c96f3e14ab69c7ed6c80db2ed471c6cef9b7 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,20 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <evanlimanto@gmail.com>, 2013.
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
-# Muhammad Panji <sumodirjo@gmail.com>, 2012.
-# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,78 +160,82 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 menit yang lalu"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} menit yang lalu"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 jam yang lalu"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} jam yang lalu"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} hari yang lalu"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} bulan yang lalu"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "Oke"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "Pilih"
 
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Batalkan"
+msgstr "Batal"
 
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "Pilih"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:222
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Tidak"
 
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr "Oke"
+
 #: 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."
@@ -300,7 +297,7 @@ msgstr "Bagikan lewat tautan"
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Sandi"
 
@@ -403,24 +400,27 @@ msgstr "Setel ulang sandi ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
+#: 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:5
-msgid "Reset email send."
-msgstr "Email penyetelan ulang dikirim."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Permintaan gagal!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Nama Pengguna"
+msgstr "Nama pengguna"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Ajukan penyetelan ulang"
 
@@ -474,7 +474,7 @@ msgstr "Edit kategori"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "Tambahkan"
+msgstr "Tambah"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -520,43 +520,43 @@ msgstr "Buat sebuah <strong>akun admin</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "Tingkat Lanjut"
+msgstr "Lanjutan"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurasikan basis data"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "akan digunakan"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Pengguna basis data"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Sandi basis data"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nama basis data"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tablespace basis data"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host basis data"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
@@ -564,37 +564,42 @@ msgstr "Selesaikan instalasi"
 msgid "web services under your control"
 msgstr "layanan web dalam kontrol Anda"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Keluar"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Masuk otomatis ditolak!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin dalam bahaya!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Mohon ubah sandi Anda untuk mengamankan kembali akun Anda."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Lupa sandi?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "selalu masuk"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Masuk"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 591a4e843bf97846ac07d7859b0e7c8ef73ff063..12586133ad5eac1a52c5a32ebf7aa50b10959eeb 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
-# Muhammad Panji <sumodirjo@gmail.com>, 2012.
-# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,13 +27,9 @@ msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
 msgid "Could not move %s"
 msgstr "Tidak dapat memindahkan %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Tidak dapat mengubah nama berkas"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal"
+msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -83,55 +74,59 @@ msgstr "Direktori tidak valid."
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Bagikan"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sarankan nama"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Lakukan operasi penghapusan"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 berkas diunggah"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "berkas diunggah"
 
@@ -157,69 +152,77 @@ msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkr
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau ukurannya 0 byte"
+msgstr "Gagal mengunggah berkas Anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL tidak boleh kosong"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Galat"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} folder"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} berkas"
 
+#: 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 "Tidak dapat mengubah nama berkas"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Unggah"
@@ -280,37 +283,37 @@ msgstr "Berkas yang dihapus"
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Anda tidak memiliki izin menulis di sini."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Unggahan terlalu besar"
+msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
 
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 7a7d4d5211df5e0a202e980284398103444cbf08..573bf66a00a20164f73f597627318a0e43cc84d6 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-21 00:14+0100\n"
-"PO-Revision-Date: 2013-02-20 03:12+0000\n"
-"Last-Translator: w41l <walecha99@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Menyimpan..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Enkripsi berkas aktif."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Tipe berkas berikut tidak akan dienkripsi:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Kecualikan tipe berkas berikut dari enkripsi:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Tidak ada"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 2772346657a0c94dfa454fa9812fe964d40d98cc..bc601626910dace7e94c064ac1f747ebee0ce75d 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,19 +37,26 @@ msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
 msgid "Error configuring Google Drive storage"
 msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
 
-#: lib/config.php:424
+#: 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 "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: lib/config.php:427
+#: 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 "<b>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
+#: 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 "Penyimpanan Eksternal"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 9bd840324e955ae01021cf9fe56a75e2567daa51..e0f2c6ca1cd414069534c98f8dc59819240ce7e1 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-#  <romihardiyanto@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 060a99434e89e2ddb2b8d7960f614583284bda53..feac24537213922edadcef9a414798e80684732a 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:10+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,43 +27,43 @@ msgstr "Tidak dapat menghapus permanen %s"
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "jalankan operasi pemulihan"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
-msgstr "kesalahan"
+msgstr "Galat"
 
 #: js/trash.js:34
 msgid "delete file permanently"
 msgstr "hapus berkas secara permanen"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
-msgstr "hapus secara permanen"
+msgstr "Hapus secara permanen"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nama"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Dihapus"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
-msgstr "1 map"
+msgstr "1 folder"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
-msgstr "{count} map"
+msgstr "{count} folder"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} berkas"
 
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 2dd987695e426ebf52099a2eee6d6d2b37bfedbe..a22d263e44e0887dedf0002a2ccda7c9b901d75b 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index bd9587aa6572d814b234aa68a82e5e12c1b4f286..fd89139ada64d22865d008a2dda78e6055f3916e 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mohamad Hasan Al Banna <se7entime@gmail.com>, 2013.
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-#  <romihardiyanto@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +17,47 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Pribadi"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Setelan"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplikasi"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Pengunduhan ZIP dimatikan."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Berkas harus diunduh satu persatu."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Kembali ke Daftar Berkas"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Berkas yang dipilih terlalu besar untuk dibuat berkas zip-nya."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "tidak dapat ditentukan"
 
@@ -96,10 +93,6 @@ msgstr "Setel nama pengguna admin."
 msgid "Set an admin password."
 msgstr "Setel sandi admin."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Tentukan folder data."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Galat Basis Data: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Perintah yang bermasalah: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Hapus pengguna ini dari MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Hapus pengguna ini dari MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
@@ -242,19 +239,6 @@ msgstr "tahun kemarin"
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s tersedia. Dapatkan <a href=\"%s\">info lebih lanjut</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "terbaru"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Pemeriksaan pembaruan dinonaktifkan."
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 197d26ac203908989536faf2687217efd324e0f3..1b000f8b87815b48b561237b315fa2c0c2f2583c 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
-# Muhammad Panji <sumodirjo@gmail.com>, 2012.
-# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Tidak dapat memuat daftar dari App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Galat autentikasi"
+msgstr "Galat saat autentikasi"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Tidak dapat mengubah nama tampilan"
 
@@ -100,7 +98,7 @@ msgstr "Nonaktifkan"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Aktifkan"
+msgstr "aktifkan"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -122,52 +120,52 @@ msgstr "Gagal ketika memperbarui aplikasi"
 msgid "Updated"
 msgstr "Diperbarui"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "urungkan"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Tidak dapat menghapus pengguna"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grup"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Admin Grup"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "tambah grup"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Tuliskan nama pengguna yang valid"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Gagal membuat pengguna"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Tuliskan sandi yang valid"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -192,7 +190,7 @@ msgstr "Peringatan Persiapan"
 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 dikonfigurasi untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
+msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
 #: templates/admin.php:33
 #, php-format
@@ -318,19 +316,19 @@ msgstr "Catat"
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +399,7 @@ msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
 msgid "Show First Run Wizard again"
 msgstr "Tampilkan Penuntun Konfigurasi Awal"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Sandi"
 
@@ -425,82 +423,74 @@ msgstr "Sandi baru"
 msgid "Change password"
 msgstr "Ubah sandi"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Nama tampilan Anda telah diubah"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Tidak dapat mengubah nama tampilan Anda"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Ubah nama tampilan"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Alamat email Anda"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nama Masuk"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Penyimpanan Baku"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Tak terbatas"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Lainnya"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Penyimpanan"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "ubah nama tampilan"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "setel sandi baru"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 75e5bbf8d995eff3dc8b3ed15288236186f70d61..bf1a1d3f440f3f7c54df23e5fa893551800e3adf 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mr.pige_ina@yahoo.co.id>, 2012.
-#  <romihardiyanto@gmail.com>, 2013.
-# Widya Walesa <walecha99@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 14:40+0000\n"
-"Last-Translator: rodin <romihardiyanto@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Gagal menghapus konfigurasi server"
@@ -42,7 +43,7 @@ msgstr "Konfigurasi salah. Silakan lihat log ownCloud untuk lengkapnya."
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "penghapusan gagal"
+msgstr "Penghapusan gagal"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -56,281 +57,363 @@ msgstr "Biarkan pengaturan?"
 msgid "Cannot add server configuration"
 msgstr "Gagal menambah konfigurasi server"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukses"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Galat"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Tes koneksi sukses"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Tes koneksi gagal"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Konfirmasi Penghapusan"
 
-#: templates/settings.php:8
+#: 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 "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya."
 
-#: templates/settings.php:11
+#: 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 "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Konfigurasi server"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Tambah Konfigurasi Server"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
-msgstr "host"
+msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Satu Base DN per baris"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: 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 "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr "kata kunci"
+msgstr "Sandi"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "gunakan saringan login"
 
-#: templates/settings.php:53
+#: 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 "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Daftar Filter Pengguna"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "saringan grup"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definisikan filter untuk diterapkan saat menerima grup."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Pengaturan Koneksi"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurasi Aktif"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host Cadangan (Replika)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Port Cadangan (Replika)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Nonaktifkan Server Utama"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "gunakan TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "tidak disarankan, gunakan hanya untuk pengujian."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Gunakan Tembolok untuk Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "dalam detik. perubahan mengosongkan cache"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Pengaturan Direktori"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Bidang Tampilan Nama Pengguna"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Pohon Pengguna Dasar"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Satu Pengguna Base DN per baris"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atribut Pencarian Pengguna"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Pilihan; satu atribut per baris"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Bidang Tampilan Nama Grup"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Pohon Grup Dasar"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Satu Grup Base DN per baris"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atribut Pencarian Grup"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "asosiasi Anggota-Grup"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atribut Khusus"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Bidang Kuota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kuota Baku"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Bidang Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Aturan Penamaan Folder Home Pengguna"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
 
-#: templates/settings.php:99
+#: 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 "Uji Konfigurasi"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
-msgstr "bantuan"
+msgstr "Bantuan"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 9ae62e5a2cf80d8b8eddc9bf1ef4ee7be4179fe6..f4b9d4b50e5f31c548d7cc4003cb2de4ceb04bf8 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Widya Walesa <walecha99@gmail.com>, 2013.
+# w41l <walecha99@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 02:30+0000\n"
-"Last-Translator: w41l <walecha99@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 2d4e0839ee43111d94e449bb4b6ac15bd614f393..b257c623341481b533ca020845ba3300570cbefa 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <kaztraz@gmail.com>, 2012.
-#   <sveinng@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -162,75 +160,79 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
-msgstr "sek síðan"
+msgstr "sek."
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr "1 min síðan"
+msgstr "Fyrir 1 mínútu"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} min síðan"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "fyrir {hours} klst."
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dagar síðan"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "fyrir {months} mánuðum"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
-msgstr "árum síðan"
+msgstr "einhverjum árum"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Veldu"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nei"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Já"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nei"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Í lagi"
 
@@ -295,7 +297,7 @@ msgstr "Deila með veftengli"
 msgid "Password protect"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -398,24 +400,27 @@ msgstr "endursetja ownCloud lykilorð"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið."
+#: 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:5
-msgid "Reset email send."
-msgstr "Beiðni um endursetningu send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Beiðni mistókst!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Notendanafn"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Endursetja lykilorð"
 
@@ -437,7 +442,7 @@ msgstr "Endursetja lykilorð"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Persónustillingar"
+msgstr "Um mig"
 
 #: strings.php:6
 msgid "Users"
@@ -449,7 +454,7 @@ msgstr "Forrit"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Vefstjórn"
+msgstr "Stjórnun"
 
 #: strings.php:9
 msgid "Help"
@@ -469,7 +474,7 @@ msgstr "Breyta flokkum"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "Bæta"
+msgstr "Bæta við"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -521,37 +526,37 @@ msgstr "Ítarlegt"
 msgid "Data folder"
 msgstr "Gagnamappa"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Stilla gagnagrunn"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "verður notað"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Gagnagrunns notandi"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Gagnagrunns lykilorð"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nafn gagnagrunns"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Töflusvæði gagnagrunns"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Netþjónn gagnagrunns"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
@@ -559,37 +564,42 @@ msgstr "Virkja uppsetningu"
 msgid "web services under your control"
 msgstr "vefþjónusta undir þinni stjórn"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Útskrá"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Sjálfvirkri innskráningu hafnað!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt að einhver annar hafi komist inn á aðganginn þinn."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Týndir þú lykilorðinu?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "muna eftir mér"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "<strong>Skrá inn</strong>"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/is/files.po b/l10n/is/files.po
index a5153c7f0d5e09fadcc9bfa3dc6dae4443f5a3c5..89771c7ed56e6db963984b5531917782c842b32a 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr "Gat ekki fært %s - Skrá með þessu nafni er þegar til"
 msgid "Could not move %s"
 msgstr "Gat ekki fært %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Gat ekki endurskýrt skrá"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrá var send inn. Óþekkt villa."
@@ -79,55 +74,59 @@ msgstr "Ógild mappa."
 msgid "Files"
 msgstr "Skrár"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Deila"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Eyða"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "stinga upp á nafni"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "hætta við"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 skrá innsend"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Innsending á skrá mistókst, hugsanlega sendir þú möppu eða skráin er 0 bæti."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Ekki nægt pláss tiltækt"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Vefslóð má ekki vera tóm."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Villa"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} skrár"
 
+#: 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 "Gat ekki endurskýrt skrá"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Senda inn"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Er að skima"
 
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 63f151c73c1b3356e86731923977b5802eacb7d6..1d993ab33690f0b4e2af41a96e233b40868e938b 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Er að vista ..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ekkert"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 644ef518ad452ec0c3227acb9fe687163aacec39..0cff6001507b95f8bbc056fc54fc7104947e79da 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +37,26 @@ msgstr "Gefðu upp virkan Dropbox lykil og leynikóða"
 msgid "Error configuring Google Drive storage"
 msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
 
-#: lib/config.php:423
+#: 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 "<b>Aðvörun:</b> \"smbclient\" er ekki uppsettur. Uppsetning á CIFS/SMB gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
 
-#: lib/config.php:426
+#: 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 "<b>Aðvörun:</b> FTP stuðningur í PHP er ekki virkur. Uppsetning á FTP gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
 
+#: 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 "Ytri gagnageymsla"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index d37c6475559b7695dd66b4e1b23151875ef882d8..aba9b4e8da28671544edb6ed2afbff71b3f24090 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 15:08+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Lykilorð"
 msgid "Submit"
 msgstr "Senda"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deildi möppunni %s með þér"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deildi skránni %s með þér"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Yfirlit ekki í boði fyrir"
 
-#: templates/public.php:43
+#: 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 b6fccfcb1c9b62c7df44657db7e9bad15e59142c..ef4d5da4a6e6100e905d900c393fd72eea368209 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Villa"
 
@@ -39,31 +39,31 @@ msgstr "Villa"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nafn"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} skrár"
 
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index 4159653790a1689f5952bbeb2d01c8f8b6096a3f..ad7f909d9f4a9682fb5aeca5794c3014d3827775 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 4d18e99a26e22aad1967f2b9f2fc63ab914519d9..bd2260d509de8b41e6784005ebc45848af84a9d7 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hjálp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Um mig"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Stillingar"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Notendur"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Forrit"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Stjórnun"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Slökkt á ZIP niðurhali."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Skrárnar verður að sækja eina og eina"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Aftur í skrár"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrár eru of stórar til að búa til ZIP skrá."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +239,6 @@ msgstr "síðasta ári"
 msgid "years ago"
 msgstr "einhverjum árum"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s er í boði. Sækja <a href=\"%s\">meiri upplýsingar</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "nýjasta útgáfa"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "uppfærslupróf er ekki virkjað"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index c26757a9a0ce5a6623377bfb10e3a17fe38525b6..a70339dd89c8f8ca3eb6ff82f69f4e3bb7d395cd 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ekki tókst að hlaða lista frá forrita síðu"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Villa við auðkenningu"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Er að vista ..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Hópar"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Hópstjóri"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Eyða"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__nafn_tungumáls__"
 
@@ -313,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -420,82 +423,74 @@ msgstr "Nýtt lykilorð"
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Netfangið þitt"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Tungumál"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Búa til"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Sjálfgefin gagnageymsla"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ótakmarkað"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Annað"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "gagnapláss"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 02d72b9058d087081d53d04e19577f4fa9c38305..42655e49061f704d2605721258233593540af86b 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Villa"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Netþjónn"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjálp"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 8bf055721845f4840753adee06f1cab83c2cae5d..6daf7cdbf02fba8cfdfaabe59bb6cef75ac57dab 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sveinng@gmail.com>, 2012.
+# 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr "Vefslóð: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 795ef1ace699ff32eacb67afac34aeb720190284..5ee1e5c44b1878865022cd8388a4732cafb8099f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cosenal@gmail.com>, 2011.
-# Francesco Apruzzese <cescoap@gmail.com>, 2011, 2012.
-#   <marco@carnazzo.it>, 2011, 2012.
-#  <pgcloud@imballaggi.net>, 2013.
-#   <rb.colombo@gmail.com>, 2011.
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -166,75 +161,79 @@ msgstr "Dicembre"
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuti fa"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ore fa"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} giorni fa"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} mesi fa"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "anni fa"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Scegli"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annulla"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sì"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "No"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -299,7 +298,7 @@ msgstr "Condividi con collegamento"
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Password"
 
@@ -357,11 +356,11 @@ msgstr "aggiornare"
 
 #: js/share.js:331
 msgid "delete"
-msgstr "eliminare"
+msgstr "elimina"
 
 #: js/share.js:334
 msgid "share"
-msgstr "condividere"
+msgstr "condividi"
 
 #: js/share.js:368 js/share.js:564
 msgid "Password protected"
@@ -402,24 +401,27 @@ msgstr "Ripristino password di ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usa il collegamento seguente per ripristinare la password: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Riceverai un collegamento per ripristinare la tua password via email"
+#: 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 "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Email di ripristino inviata."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Richiesta non riuscita!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Riceverai un collegamento per ripristinare la tua password via email"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nome utente"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Richiesta di ripristino"
 
@@ -469,7 +471,7 @@ msgstr "Nuvola non trovata"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Modifica le categorie"
+msgstr "Modifica categorie"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -519,43 +521,43 @@ msgstr "Crea un <strong>account amministratore</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "Avanzate"
+msgstr "Avanzat"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "sarà utilizzato"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
@@ -563,37 +565,42 @@ msgstr "Termina la configurazione"
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Esci"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Accesso automatico rifiutato."
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Se non hai cambiato la password recentemente, il tuo account potrebbe essere compromesso."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Accedi"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 00e752a4fc893ee452170bab91c191500b99d556..87ac3c24631d1981c56a6c44882987190e4cacf0 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cosenal@gmail.com>, 2011.
-# Francesco Apruzzese <cescoap@gmail.com>, 2011.
-#   <marco@carnazzo.it>, 2012.
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 07:10+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -31,17 +28,13 @@ msgstr "Impossibile spostare %s - un file con questo nome esiste già"
 msgid "Could not move %s"
 msgstr "Impossibile spostare %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Impossibile rinominare il file"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Non ci sono errori, file caricato con successo"
+msgstr "Non ci sono errori, il file è stato caricato correttamente"
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,11 +45,11 @@ msgstr "Il file caricato supera la direttiva upload_max_filesize in php.ini:"
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
+msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Il file è stato parzialmente caricato"
+msgstr "Il file è stato caricato solo parzialmente"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -64,7 +57,7 @@ msgstr "Nessun file è stato caricato"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Cartella temporanea mancante"
+msgstr "Manca una cartella temporanea"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -82,55 +75,59 @@ msgstr "Cartella non valida."
 msgid "Files"
 msgstr "File"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Condividi"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "esegui l'operazione di eliminazione"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "caricamento file"
 
@@ -156,69 +153,77 @@ msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggi
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
+msgstr "Impossibile caricare il file poiché è una cartella o ha una dimensione di 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Spazio disponibile insufficiente"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "L'URL non può essere vuoto."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Errore"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} file"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato a ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Impossibile rinominare il file"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Carica"
@@ -279,37 +284,37 @@ msgstr "File eliminati"
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Qui non hai i permessi di scrittura."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Il file caricato è troppo grande"
+msgstr "Caricamento troppo grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scansione corrente"
 
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index e94b78922132488a6ca7c664bc3fdcdcfb47cdf4..d4916e8b50e6c7b0d0de806117537b527379754f 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 04:40+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "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"
@@ -18,22 +18,87 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Chiave di ripristino abilitata correttamente"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino."
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Chiave di ripristinata disabilitata correttamente"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino."
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Password modificata correttamente."
+
+#: ajax/changeRecoveryPassword.php:51
+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."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Salvataggio in corso..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "La cifratura dei file è abilitata."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Password di ripristino dell'account"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Abilitata"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr "Vecchia password di ripristino dell'account"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Nuova password di ripristino dell'account"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "I seguenti tipi di file non saranno cifrati:"
+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"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Escludi i seguenti tipi di file dalla cifratura:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Impostazioni di ripristino dei file aggiornate"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nessuna"
+#: templates/settings-personal.php:28
+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 84e772567cd37dcd5b78381a5e3afa45fd70f744..912c686bb8197cf0c0a631405ffed13ecd0bd844 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
-# 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -39,19 +37,26 @@ msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
 msgid "Error configuring Google Drive storage"
 msgstr "Errore durante la configurazione dell'archivio Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
 
-#: lib/config.php:426
+#: 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 "<b>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo."
 
+#: 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 "<b>Avviso:</b> il supporto Curl di PHP non è abilitato o non è installato. Impossibile montare condivisioni ownCloud / WebDAV o GoogleDrive. Chiedi all'amministratore di sistema di installarlo."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Archiviazione esterna"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index aaabba1bea3e0db1cd5f540279dd72b1096f0439..49f2233620b0bd6293240aa61cb4564071b23b15 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 06:41+0000\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"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -26,24 +25,24 @@ msgstr "Password"
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ha condiviso la cartella %s con te"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ha condiviso il file %s con te"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nessuna anteprima disponibile per"
 
-#: templates/public.php:37
+#: 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 c120324a36d9f389a09eef9825a7b7f3926ce3a5..d0590c78c7fc295d7790b19024a3b74bbdf182da 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/files_trashbin.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -28,11 +27,11 @@ msgstr "Impossibile eliminare %s definitivamente"
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "esegui operazione di ripristino"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Errore"
 
@@ -40,31 +39,31 @@ msgstr "Errore"
 msgid "delete file permanently"
 msgstr "elimina il file definitivamente"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminati"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 file"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} file"
 
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 57ca778df641b10a395267484c54c91dc8b0b865..eecb2f8f5e5f4da18151c63ad2a434d46c01b8e1 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:30+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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"
@@ -41,11 +40,11 @@ msgstr "non riuscita"
 msgid "File %s could not be reverted to version %s"
 msgstr "Il file %s non può essere ripristinato alla versione %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Non sono disponibili versioni precedenti"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nessun percorso specificato"
 
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 92bba9c7d3785704286a1e38d1cf990329b3114e..a27bfd728af7dbee87a326b68346a3cbf3e50317 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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,47 +18,47 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Aiuto"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Utenti"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "non può essere determinato"
 
@@ -94,10 +94,6 @@ msgstr "Imposta un nome utente di amministrazione."
 msgid "Set an admin password."
 msgstr "Imposta una password di amministrazione."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Specifica una cartella dei dati."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome utente e/o password di PostgreSQL non validi"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nome utente e/o password di Oracle non validi"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "La connessione a Oracle non può essere stabilita"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nome utente e/o password di MySQL non validi"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Errore DB: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Il comando non consentito era: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utente MySQL '%s'@'localhost' esiste già."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Elimina questo utente da MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utente MySQL '%s'@'%%' esiste già"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Elimina questo utente da MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome utente e/o password di Oracle non validi"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
@@ -194,7 +194,7 @@ msgstr "secondi fa"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1 minuto fa"
+msgstr "Un minuto fa"
 
 #: template.php:115
 #, php-format
@@ -225,7 +225,7 @@ msgstr "%d giorni fa"
 
 #: template.php:121
 msgid "last month"
-msgstr "il mese scorso"
+msgstr "mese scorso"
 
 #: template.php:122
 #, php-format
@@ -234,25 +234,12 @@ msgstr "%d mesi fa"
 
 #: template.php:123
 msgid "last year"
-msgstr "l'anno scorso"
+msgstr "anno scorso"
 
 #: template.php:124
 msgid "years ago"
 msgstr "anni fa"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s è disponibile. Ottieni <a href=\"%s\">ulteriori informazioni</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "aggiornato"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "il controllo degli aggiornamenti è disabilitato"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 0e4be0b729a3439a2cdf7712c8c9731f175528ef..b3531ea04b0692324829d44520b08d115ad7b333 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <formalist@email.it>, 2012.
-# Francesco Apruzzese <cescoap@gmail.com>, 2011.
-#   <icewind1991@gmail.com>, 2012.
-# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <marco@carnazzo.it>, 2011-2013.
-#   <rb.colombo@gmail.com>, 2011.
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Impossibile caricare l'elenco dall'App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Errore di autenticazione"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Il tuo nome visualizzato è stato cambiato."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Impossibile cambiare il nome visualizzato"
 
@@ -123,52 +121,52 @@ msgstr "Errore durante l'aggiornamento"
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "eliminati"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "annulla"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Gruppi"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppi amministrati"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "aggiungi gruppo"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Deve essere fornito un nome utente valido"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Errore durante la creazione dell'utente"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Deve essere fornita una password valida"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -319,19 +317,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr "Più"
+msgstr "Altro"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -402,7 +400,7 @@ msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Password"
 
@@ -426,82 +424,74 @@ msgstr "Nuova password"
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Il tuo nome visualizzato è stato cambiato"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Impossibile cambiare il tuo nome visualizzato"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Cambia il nome visualizzato"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Email"
+msgstr "Posta elettronica"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nome utente"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Password di ripristino amministrativa"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Archiviazione predefinita"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Illimitata"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "cambia il nome visualizzato"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "imposta una nuova password"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 36930d04bfbc89d9e72d4bda1bbd0546421e68a8..01e4970a27d3359ad6da96011042dec594f76b36 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Innocenzo Ventre <el.diabl09@gmail.com>, 2012.
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +18,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Cancellazione delle associazioni non riuscita."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Eliminazione della configurazione del server non riuscita"
@@ -55,281 +58,363 @@ msgstr "Vuoi mantenere le impostazioni?"
 msgid "Cannot add server configuration"
 msgstr "Impossibile aggiungere la configurazione del server"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "associazioni cancellate"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Riuscito"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Errore"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Prova di connessione riuscita"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Prova di connessione non riuscita"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Conferma l'eliminazione"
 
-#: templates/settings.php:8
+#: 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 "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
 
-#: templates/settings.php:11
+#: 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 "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configurazione del server"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Aggiungi configurazione del server"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un DN base per riga"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN utente"
 
-#: templates/settings.php:45
+#: 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 "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro per l'accesso utente"
 
-#: templates/settings.php:53
+#: 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 "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro per l'elenco utenti"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro per il gruppo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Impostazioni di connessione"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configurazione attiva"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se deselezionata, questa configurazione sarà saltata."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Host di backup (Replica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta di backup (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Disabilita server principale"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Se abilitata, ownCloud si collegherà solo al server di replica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Da non utilizzare per le connessioni LDAPS, non funzionerà."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Non consigliato, utilizzare solo per test."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Tempo di vita della cache"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Impostazioni delle cartelle"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un DN base utente per riga"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Attributi di ricerca utente"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opzionale; un attributo per riga"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un DN base gruppo per riga"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Attributi di ricerca gruppo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo Quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota predefinita"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regola di assegnazione del nome della cartella utente"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome utente interno"
+
+#: 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 "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà incrementato/decrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una porta di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Attributo nome utente interno:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Ignora rilevamento UUID"
+
+#: 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 "In modo predefinito, ownCloud rileva automaticamente l'attributo UUID. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Attributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Associazione Nome utente-Utente LDAP"
+
+#: 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 "ownCloud utilizza i nomi utente per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente di ownCloud e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate da ownCloud. Il nome utente interno di ownCloud è utilizzato dappertutto in ownCloud. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione. Procedere alla cancellazione delle associazioni solo in una fase sperimentale o di test."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Cancella associazione Nome utente-Utente LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Prova configurazione"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index ba6bfbe7d44cfc720d07e631f2a32edb3ea46f05..342564faf720c0b97cc7b0c7ee83e52d1d3ea132 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012-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-01-17 00:26+0100\n"
-"PO-Revision-Date: 2013-01-16 06:51+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:26+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Autenticazione WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index c4bbe6b4329379fec6511469b7cf636eefb1f3a5..108f1136e381dbadb8f870cc7f0ff3f044955d5e 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
-#   <tetuyano+transi@gmail.com>, 2012.
-# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -164,75 +161,79 @@ msgstr "12月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
-msgstr "秒前"
+msgstr "数秒前"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 分前"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分前"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 時間前"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} 時間前"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} 日前"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "一月前"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "一年前"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "選択"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "いいえ"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr "ファイルピッカーのテンプレートの読み込みエラー"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "はい"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "いいえ"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -297,7 +298,7 @@ msgstr "URLリンクで共有"
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "パスワード"
 
@@ -400,24 +401,27 @@ msgstr "ownCloudのパスワードをリセットします"
 msgid "Use the following link to reset your password: {link}"
 msgstr "パスワードをリセットするには次のリンクをクリックして下さい: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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 "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信出来ない場合は、スパム／迷惑メールフォルダを確認して下さい。<br>もしそこにもない場合は、管理者に問い合わせてください。"
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "リセットメールを送信します。"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "リクエスト失敗！"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "メールでパスワードをリセットするリンクが届きます。"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "ユーザ名"
+msgstr "ユーザー名"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "リセットを要求します。"
 
@@ -439,7 +443,7 @@ msgstr "パスワードをリセット"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "個人設定"
+msgstr "個人"
 
 #: strings.php:6
 msgid "Users"
@@ -451,7 +455,7 @@ msgstr "アプリ"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "管理者"
+msgstr "管理"
 
 #: strings.php:9
 msgid "Help"
@@ -496,7 +500,7 @@ msgstr "セキュアな乱数生成器が利用可能ではありません。PHP
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr "セキュアな乱数生成器が無い場合、攻撃者はパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。"
+msgstr "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。"
 
 #: templates/installation.php:39
 msgid ""
@@ -523,75 +527,80 @@ msgstr "詳細設定"
 msgid "Data folder"
 msgstr "データフォルダ"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "データベースのユーザ名"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "データベースの表領域"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "管理下にあるウェブサービス"
+msgstr "管理下のウェブサービス"
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "ログアウト"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自動ログインは拒否されました！"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "アカウント保護の為、パスワードを再度の変更をお願いいたします。"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "ログイン"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "代替ログイン"
 
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index ebbea30f049ecc96a1f3244d6226eb53b74fe663..f18a6daef91589735778ca30af509194ead67a78 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
-# <tetuyano+transi@gmail.com>, 2012.
-#   <tetuyano+transi@gmail.com>, 2012.
-# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 12:00+0000\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -32,10 +28,6 @@ msgstr "%s を移動できませんでした ― この名前のファイルは
 msgid "Could not move %s"
 msgstr "%s を移動できませんでした"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ファイル名の変更ができません"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
@@ -53,11 +45,11 @@ msgstr "アップロードされたファイルはphp.ini の upload_max_filesiz
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "アップロードされたファイルはHTMLのフォームに設定されたMAX_FILE_SIZEに設定されたサイズを超えています"
+msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "ファイルは一部分しかアップロードされませんでした"
+msgstr "アップロードファイルは一部分だけアップロードされました"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -65,7 +57,7 @@ msgstr "ファイルはアップロードされませんでした"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "テンポラリフォルダが見つかりません"
+msgstr "一時保存フォルダが見つかりません"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -83,55 +75,59 @@ msgstr "無効なディレクトリです。"
 msgid "Files"
 msgstr "ファイル"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "共有"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "削除"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "保留"
+msgstr "中断"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} はすでに存在しています"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} を {new_name} に置換"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "削除を実行"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "ファイルを1つアップロード中"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ファイルをアップロード中"
 
@@ -157,69 +153,77 @@ msgstr "あなたのストレージは一杯です。ファイルの更新と同
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ディレクトリもしくは0バイトのファイルはアップロードできません"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "利用可能なスペースが十分にありません"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URLは空にできません。"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "エラー"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "更新日時"
+msgstr "変更"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ファイル"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "無効なフォルダ名です。'Shared' の利用はownCloudで予約済みです"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "ファイル名の変更ができません"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "アップロード"
@@ -258,7 +262,7 @@ msgstr "保存"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "新規"
+msgstr "新規作成"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -280,37 +284,37 @@ msgstr "削除ファイル"
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "あなたには書き込み権限がありません。"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "共有しない"
+msgstr "共有解除"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "ファイルサイズが大きすぎます"
+msgstr "アップロードには大きすぎます。"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "スキャン中"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 6d5a563dfe035058e3aa36226522400ca440607d..218b16a00e60261d349d6ff1a5016d51f407c82e 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -19,22 +19,87 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。"
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "保存中..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "暗号化"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ファイルの暗号化は有効です。"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "復旧アカウントのパスワード"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "有効"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "無効"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "復旧キーの暗号化パスワードを変更:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "古い復旧アカウントのパスワード"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "新しい復旧アカウントのパスワード"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "次のファイルタイプは暗号化されません:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "次のファイルタイプを暗号化から除外:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "ファイル復旧設定が更新されました"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "なし"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "ファイル復旧を更新できませんでした"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 92a8319325b667359a9082cc39893c6c0b3f72fe..df05798dbd0674a52e910a245cde461dfd8c73b5 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
-# YANO Tetsu <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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\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"
 "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"
@@ -40,19 +37,26 @@ msgstr "有効なDropboxアプリのキーとパスワードを入力して下
 msgid "Error configuring Google Drive storage"
 msgstr "Googleドライブストレージの設定エラー"
 
-#: lib/config.php:423
+#: 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 "<b>警告:</b> \"smbclient\" はインストールされていません。CIFS/SMB 共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
 
-#: lib/config.php:426
+#: 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 "<b>警告:</b> PHPのFTPサポートは無効もしくはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
 
+#: 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 "<b>警告:</b> PHP の Curl サポートは無効もしくはインストールされていません。ownCloud / WebDAV もしくは GoogleDrive のマウントはできません。システム管理者にインストールをお願いして下さい。"
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "外部ストレージ"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 28be75107c8229b68f9d0b692f0e460ec3b7df04..9205b518b17c1e0ba0a666e8429cdde6fc9f2cb3 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-#   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 11:01+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "パスワード"
 msgid "Submit"
 msgstr "送信"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s はフォルダー %s をあなたと共有中です"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s はファイル %s をあなたと共有中です"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "プレビューはありません"
 
-#: templates/public.php:35
+#: 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 16d0be2a1a874dd88a64746b73d6964439f2d653..c90517e4d2b3f88d4bb9cc6057b947770d85c8a9 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "%s を完全に削除出来ませんでした"
 msgid "Couldn't restore %s"
 msgstr "%s を復元出来ませんでした"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "復元操作を実行する"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "エラー"
 
@@ -40,31 +39,31 @@ msgstr "エラー"
 msgid "delete file permanently"
 msgstr "ファイルを完全に削除する"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "完全に削除する"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "名前"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "削除済み"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} ファイル"
 
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 7b11e7cf484e5f555a0103c0f83900c506b2cb37..2b62bba4cc1517b7bd944c70aedd5c18285aa855 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
-#   <tetuyano+transi@gmail.com>, 2012.
-# YANO Tetsu <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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 05:10+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\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"
 "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"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 555153ff9e68b750336f72a93414ee490748168d..7e84b3fae215f443b9936e755fa4a0b2842c9927 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
-# YANO Tetsu <tetuyano+transi@gmail.com>, 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -20,47 +18,47 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "ヘルプ"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
-msgstr "個人設定"
+msgstr "個人"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "ユーザ"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "アプリ"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
-msgstr "管理者"
+msgstr "管理"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIPダウンロードは無効です。"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "ファイルに戻る"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "選択したファイルはZIPファイルの生成には大きすぎます。"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "測定できませんでした"
 
@@ -96,10 +94,6 @@ msgstr "管理者のユーザ名を設定。"
 msgid "Set an admin password."
 msgstr "管理者のパスワードを設定。"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "データフォルダを指定。"
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,83 +114,87 @@ msgstr "%s ではデータベース名にドットを利用できないかもし
 msgid "%s set the database host."
 msgstr "%s にデータベースホストを設定します。"
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "既存のアカウントもしくは管理者のどちらかを入力する必要があります。"
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Oracleへの接続が確立できませんでした。"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DBエラー: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "違反コマンド: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQLのユーザ '%s'@'localhost' はすでに存在します。"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "MySQLからこのユーザを削除"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQLのユーザ '%s'@'%%' はすでに存在します。"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "MySQLからこのユーザを削除する。"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "違反コマンド: \"%s\"、名前: %s、パスワード: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "秒前"
+msgstr "数秒前"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1分前"
+msgstr "1 分前"
 
 #: template.php:115
 #, php-format
@@ -227,7 +225,7 @@ msgstr "%d 日前"
 
 #: template.php:121
 msgid "last month"
-msgstr "先月"
+msgstr "一月前"
 
 #: template.php:122
 #, php-format
@@ -236,25 +234,12 @@ msgstr "%d 分前"
 
 #: template.php:123
 msgid "last year"
-msgstr "昨年"
+msgstr "一年前"
 
 #: template.php:124
 msgid "years ago"
 msgstr "年前"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s が利用可能です。<a href=\"%s\">詳細情報</a> を確認ください"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "最新です"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "更新チェックは無効です"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 1218f5a5f9f4e17406eaa1254e91037ffa837c68..6b990ab4951bead6d8d8d478100c843105abbd30 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -3,18 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
-# <tetuyano+transi@gmail.com>, 2012.
-#   <tetuyano+transi@gmail.com>, 2012.
-# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -26,12 +23,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "認証エラー"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "表示名を変更しました。"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "表示名を変更できません"
 
@@ -69,7 +70,7 @@ msgstr "言語が変更されました"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "無効なリクエストです"
+msgstr "不正なリクエスト"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -99,7 +100,7 @@ msgstr "無効"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "有効"
+msgstr "有効化"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -121,52 +122,52 @@ msgstr "アプリの更新中にエラーが発生"
 msgid "Updated"
 msgstr "更新済み"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "保存中..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "削除"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "ユーザを削除出来ません"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "グループ"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "グループ管理者"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "削除"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "グループを追加"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "有効なユーザ名を指定する必要があります"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "ユーザ作成エラー"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
@@ -317,19 +318,19 @@ msgstr "ログ"
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr "詳細"
+msgstr "もっと見る"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -337,7 +338,7 @@ 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 "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</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> ライセンスにより提供されています。"
+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
 msgid "Add your App"
@@ -394,13 +395,13 @@ msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用していま
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr "あなたのファイルを同期するためのアプリを取得"
+msgstr "ファイルを同期するためのアプリを取得"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr "初回実行ウィザードを再度表示する"
+msgstr "初回ウィザードを再表示する"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "パスワード"
 
@@ -414,92 +415,84 @@ msgstr "パスワードを変更することができません"
 
 #: templates/personal.php:40
 msgid "Current password"
-msgstr "現在のパスワード"
+msgstr "Current password"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "新しいパスワード"
+msgstr "新しいパスワードを入力"
 
 #: templates/personal.php:44
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "表示名"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "あなたの表示名を変更しました"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "あなたの表示名を変更できません"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "表示名を変更"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Email"
+msgstr "メール"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "ログイン名"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "作成"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "管理者復旧パスワード"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "デフォルトストレージ"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "無制限"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "ストレージ"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "表示名を変更"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "新しいパスワードを設定"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index b5271f2653652eee13fb893b115aef1efb4f9d47..648af63c11a18fd127a26c6b44b40b69f306b33a 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
-#   <tetuyano+transi@gmail.com>, 2012.
-# YANO Tetsu <tetuyano+transi@gmail.com>, 2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -21,6 +18,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "マッピングのクリアに失敗しました。"
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "サーバ設定の削除に失敗しました"
@@ -57,281 +58,363 @@ msgstr "設定を保持しますか？"
 msgid "Cannot add server configuration"
 msgstr "サーバ設定を追加できません"
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "接続テストに失敗しました"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "現在のサーバ設定を本当に削除してもよろしいですか？"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "削除の確認"
 
-#: templates/settings.php:8
+#: 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 "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能姓があります。システム管理者にどちらかを無効にするよう問い合わせてください。"
 
-#: templates/settings.php:11
+#: 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 "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "サーバ設定"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "サーバ設定を追加"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "ホスト"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "1行に1つのベースDN"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "ユーザDN"
 
-#: templates/settings.php:45
+#: 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 "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ユーザログインフィルタ"
 
-#: templates/settings.php:53
+#: 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 "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ユーザリストフィルタ"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "グループフィルタ"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "グループを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "接続設定"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "設定はアクティブです"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "チェックを外すと、この設定はスキップされます。"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "ポート"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "バックアップ（レプリカ）ホスト"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "バックアップ（レプリカ）ポート"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "メインサーバを無効にする"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "有効にすると、ownCloudはレプリカサーバにのみ接続します。"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLSを利用"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "LDAPS接続のために追加でそれを利用しないで下さい。失敗します。"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL証明書の確認を無効にする。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "推奨しません、テスト目的でのみ利用してください。"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "キャッシュのTTL"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "ディレクトリ設定"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "ユーザ表示名のフィールド"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "ベースユーザツリー"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "1行に1つのユーザベースDN"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "ユーザ検索属性"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "オプション：1行に1属性"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "グループ表示名のフィールド"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "グループのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "ベースグループツリー"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "1行に1つのグループベースDN"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "グループ検索属性"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "グループとメンバーの関連付け"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "クォータフィールド"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "クォータのデフォルト"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "メールフィールド"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "ユーザのホームフォルダ命名規則"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。"
 
-#: templates/settings.php:99
+#: 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 "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が必要ないことを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLのポートでもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。"
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "内部ユーザ名属性:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "UUID検出を再定義する"
+
+#: 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 "デフォルトでは、ownCloud は UUID 属性を自動的に検出します。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。"
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID属性:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "ユーザ名とLDAPユーザのマッピング"
+
+#: 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 "ownCloudは（メタ） データの保存と割り当てにユーザ名を使用します。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ownCloudユーザ名とLDAPユーザ名の間のマッピングが必要であることを意味しています。生成されたユーザ名は、LDAPユーザのUUIDとマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更をownCloudが見つけます。内部のownCloud名はownCloud全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "グループ名とLDAPグループのマッピングをクリアする"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
-msgstr "テスト設定"
+msgstr "設定をテスト"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index 966cae84162c4404c705c34266fc7cd3a0a305a2..9db2784888df7e417392d0c9347ef48a72a7bbc0 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-17 00:26+0100\n"
-"PO-Revision-Date: 2013-01-16 05:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "WebDAV 認証"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index fff9226e31d088614304f210988d575af6e90442..fc467e8e09f8ab8dae49086a925d4395f4a5c4b8 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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:10+0000\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -237,9 +241,11 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566
-#: js/share.js:578
+#: 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 ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:606
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "პაროლი"
 
@@ -319,59 +325,59 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:276
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:311
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:314
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:317
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:323
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:357 js/share.js:553
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:578
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:593
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index 342f9ca6aab58ad3ef5f63590f7653e83583caab..4a2db5dd214eddfcd3255716a2a04274f216a7ad 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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "ფაილები"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "გადმოწერა"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 5321e594c35c54b88517db4e7908682ec4767ed3..12883dff6471a6bedcd0479b0ddd9fc756e92a41 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/files_encryption.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-02-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ka/files_external.po b/l10n/ka/files_external.po
index ff99ab06484501bbba82776a33813f4e599eefda..b0114117f5bae0827b0b7f615d368dd553eefe1c 100644
--- a/l10n/ka/files_external.po
+++ b/l10n/ka/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index f4c48c38cd09e9e393ad0f5fe4b0628fc8626398..53dd73051d06c3e9fef868a140af1e2e5de57826 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Lasha GeTto <getto379@mail.ru>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-27 14:34+0100\n"
-"PO-Revision-Date: 2013-02-27 04:40+0000\n"
-"Last-Translator: GeoCybers <getto379@mail.ru>\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,14 +35,14 @@ msgstr ""
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "გადმოწერა"
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ka/files_trashbin.po b/l10n/ka/files_trashbin.po
index c20b8f1e13fa4611553dfa97f0e8f913cd9489ed..f40050033f21b02d8952425bc2d366be01322489 100644
--- a/l10n/ka/files_trashbin.po
+++ b/l10n/ka/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_versions.po b/l10n/ka/files_versions.po
index 4f6c948624dd79acf0811c8477c63e9a95bb9c54..c36ba25f09d4a8577b31ba931bb5a8884905cd75 100644
--- a/l10n/ka/files_versions.po
+++ b/l10n/ka/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/ka/lib.po b/l10n/ka/lib.po
index 607e49334b6dc47a8ffe4d24a14fd103c1034459..9974f858cf014572d65f7ec6f0b160546d88cf61 100644
--- a/l10n/ka/lib.po
+++ b/l10n/ka/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Lasha GeTto <getto379@mail.ru>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -18,43 +17,43 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "შველა"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "პერსონა"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "მომხმარებლები"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr "ZIP გადმოწერა გამორთულია"
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index f0d51ede9580a555eb06435ce613d95805482e5a..fe9f5ba85c54637c4565d9dc84fd56acc54be53c 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "პაროლი"
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index a49552a01fb6627be3a6f50d8f966c09fb51fd2c..d171be00d72574fee1306d1634c3db2b8547a5c4 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "პაროლი"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "შველა"
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
index 3c15980932ecc82f6d5b7c3821f62c6566a20322..81c256549525ade1d31ea0b64d32718ab565a0ca 100644
--- a/l10n/ka/user_webdavauth.po
+++ b/l10n/ka/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-02-27 00:08+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 8f28e3ceb968625b887a6f890386967e085f0bb3..b986b21fe37dc525a7a6d2f9bee3695842a68671 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 07:48+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\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: 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"
@@ -162,78 +160,82 @@ msgstr "დეკემბერი"
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:717
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:718
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:719
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} წუთის წინ"
 
-#: js/js.js:720
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 საათის წინ"
 
-#: js/js.js:721
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} საათის წინ"
 
-#: js/js.js:722
+#: js/js.js:723
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:723
+#: js/js.js:724
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:724
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} დღის წინ"
 
-#: js/js.js:725
+#: js/js.js:726
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:726
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} თვის წინ"
 
-#: js/js.js:727
+#: js/js.js:728
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:728
+#: js/js.js:729
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:729
+#: js/js.js:730
 msgid "years ago"
 msgstr "წლის წინ"
 
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
-msgstr "დიახ"
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr "არჩევა"
 
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "უარყოფა"
 
-#: js/oc-dialogs.js:185
-msgid "Choose"
-msgstr "არჩევა"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "კი"
 
-#: js/oc-dialogs.js:222
+#: 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."
@@ -285,7 +287,7 @@ msgstr "გაზიარდა თქვენთვის {owner}–ის 
 
 #: js/share.js:159
 msgid "Share with"
-msgstr "გაუზიარე"
+msgstr "გააზიარე შემდეგით:"
 
 #: js/share.js:164
 msgid "Share with link"
@@ -295,7 +297,7 @@ msgstr "გაუზიარე ლინკით"
 msgid "Password protect"
 msgstr "პაროლით დაცვა"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "პაროლი"
 
@@ -333,7 +335,7 @@ msgstr "გაზიარდა {item}–ში  {user}–ის მიერ"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "გაზიარების მოხსნა"
+msgstr "გაუზიარებადი"
 
 #: js/share.js:320
 msgid "can edit"
@@ -398,24 +400,27 @@ msgstr "ownCloud პაროლის შეცვლა"
 msgid "Use the following link to reset your password: {link}"
 msgstr "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "რესეტის მეილი გაიგზავნა"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "მოთხოვნა შეწყდა!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "მომხმარებელი"
+msgstr "მომხმარებლის სახელი"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "პაროლის შეცვლის მოთხოვნა"
 
@@ -441,7 +446,7 @@ msgstr "პირადი"
 
 #: strings.php:6
 msgid "Users"
-msgstr "მომხმარებლები"
+msgstr "მომხმარებელი"
 
 #: strings.php:7
 msgid "Apps"
@@ -449,7 +454,7 @@ msgstr "აპლიკაციები"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ადმინი"
+msgstr "ადმინისტრატორი"
 
 #: strings.php:9
 msgid "Help"
@@ -521,75 +526,80 @@ msgstr "დამატებითი ფუნქციები"
 msgid "Data folder"
 msgstr "მონაცემთა საქაღალდე"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "მონაცემთა ბაზის კონფიგურირება"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "მონაცემთა ბაზის მომხმარებელი"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "მონაცემთა ბაზის პაროლი"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "მონაცემთა ბაზის სახელი"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ბაზის ცხრილის ზომა"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "მონაცემთა ბაზის ჰოსტი"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები"
+msgstr "web services under your control"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "გამოსვლა"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "ავტომატური შესვლა უარყოფილია!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "თუ თქვენ არ შეცვლით პაროლს, თქვენი ანგარიში შეიძლება იყოს დაშვებადი სხვებისთვის"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "გთხოვთ შეცვალოთ თქვენი პაროლი, თქვენი ანგარიშის დასაცავად."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "დაგავიწყდათ პაროლი?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "დამახსოვრება"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "შესვლა"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "ალტერნატიული Login–ი"
 
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index fd27bc6ca29f238b5d901af21d59d889774a55eb..2b820d85a11b36945a26a5931e584e199a379598 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 07:49+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\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"
 "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"
@@ -29,10 +27,6 @@ msgstr "%s –ის გადატანა ვერ მოხერხდა
 msgid "Could not move %s"
 msgstr "%s –ის გადატანა ვერ მოხერხდა"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "ფაილის სახელის გადარქმევა ვერ მოხერხდა"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ფაილი არ აიტვირთა. უცნობი შეცდომა"
@@ -80,55 +74,59 @@ msgstr "დაუშვებელი დირექტორია."
 msgid "Files"
 msgstr "ფაილები"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "გაზიარება"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "წაშლა"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "შეცვლა"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "სახელის შემოთავაზება"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "უარყოფა"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "მიმდინარეობს წაშლის ოპერაცია"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 ფაილის ატვირთვა"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "ფაილები იტვირთება"
 
@@ -154,69 +152,77 @@ msgstr "თქვენი საცავი გადაივსო. ფა
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "საკმარისი ადგილი არ არის"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL არ შეიძლება იყოს ცარიელი."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
+#: 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 "ატვირთვა"
@@ -277,37 +283,37 @@ msgstr "წაშლილი ფაილები"
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "თქვენ არ გაქვთ ჩაწერის უფლება აქ."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "გაზიარების მოხსნა"
+msgstr "გაუზიარებადი"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
 
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index c0eb489fc80101efb680b6833fed6b9744d0fae0..d2b48f7eeb99d8ed59db45d3618443e5dfdba435 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 14:10+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\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"
 "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"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "შენახვა..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "ენკრიპცია"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "ფაილის ენკრიპცია ჩართულია."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "შემდეგი ფაილური ტიპების ენკრიპცია არ მოხდება:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "ამოიღე შემდეგი ფაილის ტიპები ენკრიპციიდან:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "არა"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index c9092e688de850b8ea26bc6a3f9afd32845edcc2..7dac10dfcea4b8e9d1f5c1630075b50f936e70dd 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 14:30+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -38,19 +37,26 @@ msgstr "გთხოვთ მიუთითოთ Dropbox აპლიკა
 msgid "Error configuring Google Drive storage"
 msgstr "შეცდომა Google Drive საცავის კონფიგურირების დროს"
 
-#: lib/config.php:424
+#: 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 "<b>გაფრთხილება:</b> \"smbclient\" არ არის ინსტალირებული. CIFS/SMB ზიარების მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის."
 
-#: lib/config.php:427
+#: 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 "<b>გაფრთხილება:</b>  FTP მხარდაჭერა არ არის აქტიური ან დაინსტალირებული. FTP ზიარის მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის."
 
+#: 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 "<b>გაფრთხილება:</b>PHP–ის Curl მხარდაჭერა არ არის ჩართული ან ინსტალირებული. ownCloud / WebDAV ან GoogleDrive–ის მონტირება შეუძლებელია. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "ექსტერნალ საცავი"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 2edbce0e43f98ff8d58bbf4895c1a916dafabd6e..6d12ca057519c698ac1ccb7adc926b93a0035de3 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 11:09+0000\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"
 "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_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 6e8e37e8184fd9573d4dbafc42000b1701b84eb3..d7d7fcb490b19df9d980ca38b754217356a01b09 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 07:30+0000\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "ფაილი %s–ის სრულად წაშლა ვერ
 msgid "Couldn't restore %s"
 msgstr "%s–ის აღდგენა ვერ მოხერხდა"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "მიმდინარეობს აღდგენის ოპერაცია"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -40,31 +39,31 @@ msgstr "შეცდომა"
 msgid "delete file permanently"
 msgstr "ფაილის სრულად წაშლა"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "სახელი"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "წაშლილი"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 77b0ca0d8d5a672622701074fb9939365989d57a..35af4eeea3b2a1f7c82d1b6f53d721ddcc8b23d2 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 14:10+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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 75c4fc21393b0706cd19ed22e94734c2669b7746..b917119121ca30b09b3da0d36c29dc4d512fde47 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 11:09+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:33+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"
@@ -19,47 +17,47 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "დახმარება"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "პირადი"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "აპლიკაციები"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP download–ი გათიშულია"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "ფაილები უნდა გადმოიტვირთოს სათითაოდ."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "უკან ფაილებში"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "არჩეული ფაილები ძალიან დიდია zip ფაილის გენერაციისთვის."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "ვერ განისაზღვრა"
 
@@ -95,10 +93,6 @@ msgstr "დააყენეთ ადმინისტრატორის 
 msgid "Set an admin password."
 msgstr "დააყენეთ ადმინისტრატორის პაროლი."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "მიუთითეთ data ფოლდერი."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,72 +113,76 @@ msgstr "%s არ მიუთითოთ წერტილი ბაზის
 msgid "%s set the database host."
 msgstr "%s მიუთითეთ ბაზის ჰოსტი."
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი."
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB შეცდომა: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Offending ბრძანება იყო: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL მომხმარებელი '%s'@'localhost' უკვე არსებობს."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
@@ -241,19 +239,6 @@ msgstr "ბოლო წელს"
 msgid "years ago"
 msgstr "წლის წინ"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s ხელმისაწვდომია. მიიღეთ <a href=\"%s\">უფრო მეტი ინფორმაცია</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "განახლებულია"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "განახლების ძებნა გათიშულია"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 7f37b1717c6d7a42da448ab276b4bd267ff78ad9..f02a499b093611f02120c59b847a5f1a97e72fdd 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <romeo@energo-pro.ge>, 2012.
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
+# drlinux64 <romeo@energo-pro.ge>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 11:20+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\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"
 "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"
@@ -23,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "ავთენტიფიკაციის შეცდომა"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "თქვენი დისფლეის სახელი უკვე შეიცვალა"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "დისფლეის სახელის შეცვლა ვერ მოხერხდა"
 
@@ -118,52 +121,52 @@ msgstr "შეცდომა აპლიკაციის განახლ
 msgid "Updated"
 msgstr "განახლებულია"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "შენახვა..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "წაშლილი"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
-msgstr "ჯგუფი"
+msgstr "ჯგუფები"
 
-#: js/users.js:91 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "ჯგუფის ადმინისტრატორი"
 
-#: js/users.js:111 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "წაშლა"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr "ჯგუფის დამატება"
 
-#: js/users.js:414
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი"
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "შეცდომა მომხმარებლის შექმნისას"
 
-#: js/users.js:420
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "უნდა მიუთითოთ არსებული პაროლი"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -314,19 +317,19 @@ msgstr "ლოგი"
 msgid "Log level"
 msgstr "ლოგირების დონე"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "უფრო მეტი"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
-msgstr "naklebi"
+msgstr "უფრო ნაკლები"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -397,7 +400,7 @@ msgstr "აპლიკაცია ფაილების სინქრო
 msgid "Show First Run Wizard again"
 msgstr "მაჩვენე თავიდან გაშვებული ვიზარდი"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "პაროლი"
 
@@ -421,82 +424,74 @@ msgstr "ახალი პაროლი"
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "დისპლეის სახელი"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "დისფლეის სახელი შეიცვალა"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "თქვენი დისფლეის სახელის შეცვლა ვერ მოხერხდა"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "დისფლეის სახელის შეცვლა"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "იმეილი"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "თქვენი იმეილ მისამართი"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "ენა"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "შექმნა"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "საწყისი საცავი"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "ულიმიტო"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "სხვა"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "საცავი"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "შეცვალე დისფლეის სახელი"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "დააყენეთ ახალი პაროლი"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "საწყისი პარამეტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index ebde56128d3e540018d18cc50aae8b23531d94cf..01096db8152a05f42ca23ba048c65c98ee4c3daa 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-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 07:50+0000\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,317 +17,403 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "შეცდომა სერვერის კონფიგურაციის წაშლისას"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "კონფიგურაცია მართებულია და კავშირი დამყარდება!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "კონფიგურაცია არ არის მართებული. გთხოვთ ჩაიხედოთ დეტალური ინფორმაციისთვის ownCloud –ის ლოგში."
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "წაშლის ველი"
+msgstr "წაშლა ვერ განხორციელდა"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "დაბრუნდებით სერვერის წინა კონფიგურაციაში?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "დავტოვოთ პარამეტრები?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
+msgstr "სერვერის პარამეტრების დამატება ვერ მოხერხდა"
+
+#: js/settings.js:111
+msgid "mappings cleared"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:112
+msgid "Success"
+msgstr "დასრულდა"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "კავშირის ტესტირება მოხერხდა"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
-msgstr ""
+msgstr "კავშირის ტესტირება ვერ მოხერხდა"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "წაშლის დადასტურება"
 
-#: templates/settings.php:8
+#: 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 ""
+msgstr "<b>გაფრთხილება:</b>  აპლიკაციის user_ldap და user_webdavauth არათავსებადია. თქვენ შეიძლება შეეჩეხოთ მოულოდნელ შშედეგებს. თხოვეთ თქვენს ადმინისტრატორს ჩათიშოს ერთერთი."
 
-#: templates/settings.php:11
+#: 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 ""
+msgstr "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "სერვერის პარამეტრები"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "სერვერის პარამეტრების დამატება"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "ჰოსტი"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr ""
+msgstr "საწყისი DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "ერთი საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "თქვენ შეგიძლიათ მიუთითოთ საწყისი DN მომხმარებლებისთვის და ჯგუფებისთვის Advanced ტაბში"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
-msgstr ""
+msgstr "მომხმარებლის DN"
 
-#: templates/settings.php:45
+#: 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 ""
+msgstr "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "პაროლი"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "ანონიმური დაშვებისთვის, დატოვეთ DN–ის და პაროლის ველები ცარიელი."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
-msgstr ""
+msgstr "მომხმარებლის ფილტრი"
 
-#: templates/settings.php:53
+#: 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 ""
+msgstr "როცა შემოსვლა განხორციელდება ასეიძლება მოვახდინოთ გაფილტვრა. %%uid შეიცვლება იუზერნეიმით მომხმარებლის ველში."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "გამოიყენეთ %%uid დამასრულებელი მაგ: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
-msgstr ""
+msgstr "მომხმარებლებიის სიის ფილტრი"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "გაფილტვრა განხორციელდება, როცა მომხმარებლების სია ჩამოიტვირთება."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
-msgstr ""
+msgstr "ჯგუფის ფილტრი"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "გაფილტვრა განხორციელდება, როცა ჯგუფის სია ჩამოიტვირთება."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "ყოველგვარი დამასრულებელის გარეშე, მაგ: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
-msgstr ""
+msgstr "კავშირის პარამეტრები"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
-msgstr ""
+msgstr "კონფიგურაცია აქტიურია"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "პორტი"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "ბექაფ  (რეპლიკა)  ჰოსტი"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "ბექაფ (რეპლიკა) პორტი"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
-msgstr ""
+msgstr "გამორთეთ ძირითადი სერვერი"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "როცა მონიშნულია, ownCloud დაუკავშირდება მხოლოდ რეპლიკა სერვერს."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr ""
+msgstr "გამოიყენეთ TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "არ გამოიყენოთ დამატებით LDAPS კავშირი. ის წარუმატებლად დასრულდება."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "გამორთეთ SSL სერთიფიკატის ვალიდაცია."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "იმ შემთხვევაში თუ მუშაობს მხოლოდ ეს ოფცია, დააიმპორტეთ LDAP სერვერის SSL სერთიფიკატი თქვენს ownCloud სერვერზე."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "არ არის რეკომენდირებული, გამოიყენეთ მხოლოდ სატესტოდ."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "ქეშის სიცოცხლის ხანგრძლივობა"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "წამებში. ცვლილება ასუფთავებს ქეშს."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "დირექტორიის პარამეტრები"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr ""
+msgstr "მომხმარებლის დისფლეის სახელის ფილდი"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP ატრიბუტი მომხმარებლის  ownCloud სახელის გენერაციისთვის."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
-msgstr ""
+msgstr "ძირითად მომხმარებელთა სია"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "მომხმარებლის ძებნის ატრიბუტი"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "ოფციონალური; თითო ატრიბუტი თითო ხაზზე"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "ჯგუფის დისფლეის სახელის ფილდი"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP ატრიბუტი ჯგუფის  ownCloud სახელის გენერაციისთვის."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr ""
+msgstr "ძირითად ჯგუფთა სია"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "ერთი ჯგუფის საწყისი DN ერთ ხაზზე"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "ჯგუფური ძებნის ატრიბუტი"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
-msgstr ""
+msgstr "ჯგუფის წევრობის ასოციაცია"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
-msgstr ""
+msgstr "სპეციალური ატრიბუტები"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
-msgstr ""
+msgstr "ქვოტას ველი"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
-msgstr ""
+msgstr "საწყისი ქვოტა"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr ""
+msgstr "ბაიტებში"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
-msgstr ""
+msgstr "იმეილის ველი"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
+msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
+
+#: templates/settings.php:101
+msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:99
-msgid "Test Configuration"
+#: 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:99
+#: 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/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index f4ffea5b9a7e24bf3e1a52012a4752c01b2047b7..275948740f4dd1c268bf4ba5ea6040f841a07960 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romeo Pirtskhalava <romeo@energo-pro.ge>, 2013.
+# drlinux64 <romeo@energo-pro.ge>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 07:50+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\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"
 "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"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index cacb6c959632c409e81e0ca739a6c9e5d613cfaf..d5e7454d04e082427f84acd6d5f8544257c24dee 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -237,8 +241,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 750b56b6b5f1d113e80e63519e995fbf3fee8244..d8ead40a6064706155178d8833d417b06692633b 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index a3a70bbe6e5c44960a9e4962860a60fc02a8a322..dda2e54fa162be857fd40e113229c00fe6e97594 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index 1b4f92a170c9698e0dd2223ecef6eaaecc12e794..61e30ed38236bc3c6fab01851d3dab95904c4460 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/files_external.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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index e94682baac09ea164915b7ba205e87025b55713a..a2eded06e4ee0e30cf57c5e8110b98015aeba073 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 649be08ae1adff076537194cd6d4a9f51847b707..28bf4f67f97f354da1cd42c3be0695a8c9e8be88 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
diff --git a/l10n/kn/files_versions.po b/l10n/kn/files_versions.po
index 57e19d178516575e0a07e8c00ed00188d87721ad..c61eacfeba8e482b655777cd8adbf41858c15ed2 100644
--- a/l10n/kn/files_versions.po
+++ b/l10n/kn/files_versions.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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 95b4872e94c36ee7424c5a51d6fb38206b92c736..2e4f63e50ecbd128820bfb46326e94bb5d0003e7 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 867408992f0d9ff8ca2391791d1d36d6e363720d..899150546d3eaf57cf0315927b311ea444860d41 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 777d0e1b974507e8f990997b6cd21b75e0c19d30..782e792ba8bca208e74dfc91a16c3629c2d33d1a 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/kn/user_webdavauth.po b/l10n/kn/user_webdavauth.po
index 16b7b5b562193d6a756da8449d55913966b441e0..771cd4f87ee1a94fb8a43c4c2cacc99d9bcea0fd 100644
--- a/l10n/kn/user_webdavauth.po
+++ b/l10n/kn/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-04-06 00:04+0200\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 6e65cc6963d14ae3bc1b85f43e26fac27a02baaf..9f921d1b041c2d335e37da3b2e268cac76d3e214 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aoiob4305@gmail.com>, 2013.
-# 남자사람  <cessnagi@gmail.com>, 2012.
-#   <limonade83@gmail.com>, 2012.
-# Park Shinjo <kde@peremen.name>, 2013.
-# Shinjo Park <kde@peremen.name>, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +53,7 @@ msgstr "추가할 분류가 없습니까?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "분류가 이미 존재합니다: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -78,7 +74,7 @@ msgstr "책갈피에 %s을(를) 추가할 수 없었습니다."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "삭제할 분류를 선택하지 않았습니다."
+msgstr "삭제할 분류를 선택하지 않았습니다. "
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -165,75 +161,79 @@ msgstr "12ì›”"
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1분 전"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes}분 전"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1시간 전"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours}시간 전"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days}일 전"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months}개월 전"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "ë…„ ì „"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "선택"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "취소"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "아니요"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "예"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "아니요"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "승락"
 
@@ -298,7 +298,7 @@ msgstr "URL 링크로 공유"
 msgid "Password protect"
 msgstr "암호 보호"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "암호"
 
@@ -348,7 +348,7 @@ msgstr "접근 제어"
 
 #: js/share.js:325
 msgid "create"
-msgstr "만들기"
+msgstr "생성"
 
 #: js/share.js:328
 msgid "update"
@@ -401,24 +401,27 @@ msgstr "ownCloud 암호 재설정"
 msgid "Use the following link to reset your password: {link}"
 msgstr "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "초기화 이메일을 보냈습니다."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "요청이 실패했습니다!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "이메일로 암호 재설정 링크를 보냈습니다."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "사용자 이름"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "요청 초기화"
 
@@ -468,7 +471,7 @@ msgstr "클라우드를 찾을 수 없습니다"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "분류 편집"
+msgstr "분류 수정"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -481,11 +484,11 @@ msgstr "보안 경고"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "ownCloud의 보안을 위하여 PHP 버전을 업데이트하십시오."
 
 #: templates/installation.php:32
 msgid ""
@@ -503,14 +506,14 @@ msgstr "안전한 난수 생성기를 사용하지 않으면 공격자가 암호
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다."
 
 #: 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 "서버를 올바르게 설정하는 방법을 알아보려면 <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">문서</a>를 참고하십시오.."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -524,37 +527,37 @@ msgstr "고급"
 msgid "Data folder"
 msgstr "데이터 폴더"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "데이터베이스 설정"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "데이터베이스 사용자"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "데이터베이스 암호"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "데이터베이스 이름"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "데이터베이스 테이블 공간"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "데이터베이스 호스트"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "설치 완료"
 
@@ -562,39 +565,44 @@ msgstr "설치 완료"
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "로그아웃"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "자동 로그인이 거부되었습니다!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "최근에 암호를 변경하지 않았다면 계정이 탈취되었을 수도 있습니다!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "계정의 안전을 위하여 암호를 변경하십시오."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "기억하기"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "로그인"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
-msgstr ""
+msgstr "대체 "
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 3aaacfdd628d48ccb30c2fad31fbf533aeb36334..d716be12d328b5b3406ccec7b81d50a7e9427285 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aoiob4305@gmail.com>, 2013.
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Harim Park <fofwisdom@gmail.com>, 2013.
-#   <limonade83@gmail.com>, 2012.
-# Park Shinjo <kde@peremen.name>, 2013.
-# Shinjo Park <kde@peremen.name>, 2012.
+# Sungjin Gang <potopro@gmail.com>, 2013
+# Sungjin Gang <potopro@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -33,17 +29,13 @@ msgstr "%s 항목을 이동시키지 못하였음 - 파일 이름이 이미 존
 msgid "Could not move %s"
 msgstr "%s 항목을 이딩시키지 못하였음"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "업로드에 성공하였습니다."
+msgstr "파일 업로드에 성공하였습니다."
 
 #: ajax/upload.php:27
 msgid ""
@@ -54,19 +46,19 @@ msgstr "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:"
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "업로드한 파일이 HTML 문서에 지정한 MAX_FILE_SIZE보다 더 큼"
+msgstr "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "파일이 부분적으로 업로드됨"
+msgstr "파일의 일부분만 업로드됨"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "업로드된 파일 없음"
+msgstr "파일이 업로드되지 않았음"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "임시 폴더가 사라짐"
+msgstr "임시 폴더가 없음"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -74,7 +66,7 @@ msgstr "디스크에 쓰지 못했습니다"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "저장소가 용량이 충분하지 않습니다."
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -84,57 +76,61 @@ msgstr "올바르지 않은 디렉터리입니다."
 msgid "Files"
 msgstr "파일"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "공유"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "영원히 삭제"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "삭제"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "보류 중"
+msgstr "대기 중"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "바꾸기"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "이름 제안"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
-msgstr "실행 취소"
+msgstr "되돌리기"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "삭제 작업중"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "파일 1개 업로드 중"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "파일 업로드중"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -158,69 +154,77 @@ msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "다운로드가 준비 중입니다. 파일 크기가 크다면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "이 파일은 디렉터리이거나 비어 있기 때문에 업로드할 수 없습니다"
+msgstr "디렉터리 및 빈 파일은 업로드할 수 없습니다"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "여유 공간이 부족합니다"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL을 입력해야 합니다."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "오류"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "파일 {count}개"
 
+#: 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 "업로드"
@@ -275,43 +279,43 @@ msgstr "링크에서"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "파일 삭제됨"
 
 #: templates/index.php:48
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "당신은 여기에 쓰기를 할 수 있는 권한이 없습니다."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "업로드 용량 초과"
+msgstr "업로드한 파일이 너무 큼"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "현재 검색"
 
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 79f1c6ae60785936c91116c9a7ae1b0ca8f3ccd1..4a5fd3c1fc2d0084c82a58c0541334ef3c4df7dc 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Shinjo Park <kde@peremen.name>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "저장 중..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "암호화"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "없음"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 306e67eeaa466593fd87ca1abba8f4c5e409368c..ce2cfcc9148e29c85ec4598b21e1847326884271 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aoiob4305@gmail.com>, 2013.
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Park Shinjo <peremen@gmail.com>, 2013.
-# Shinjo Park <kde@peremen.name>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -41,19 +37,26 @@ msgstr "올바른 Dropbox 앱 키와 암호를 입력하십시오."
 msgid "Error configuring Google Drive storage"
 msgstr "Google 드라이브 저장소 설정 오류"
 
-#: lib/config.php:423
+#: 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 "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
-#: lib/config.php:426
+#: 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 "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되지 않았습니다. FTP 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
+#: 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 "외부 저장소"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 0190903ffa085cb835a9aa05a02666af147c002a..3e8a2238f145d0c05d6fd55a7a143807d346be98 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Shinjo Park <kde@peremen.name>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:12+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "암호"
 msgid "Submit"
 msgstr "제출"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 님이 폴더 %s을(를) 공유하였습니다"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 님이 파일 %s을(를) 공유하였습니다"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "다음 항목을 미리 볼 수 없음:"
 
-#: templates/public.php:43
+#: 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 e18e542aaef13ba7acc2dc4b1f50fb2793e8db3d..c35e4b4537492d21a082f8570a73dd5370c61935 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "오류"
 
@@ -39,31 +39,31 @@ msgstr "오류"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "영원히 삭제"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "이름"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "파일 {count}개"
 
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 3598454523d28df90b1e90382845a0e913caa93f..ce0e200f0ba0a561749aff22cfd54bef9241cb19 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Shinjo Park <kde@peremen.name>, 2012.
-# Sung Jin Gang <potopro@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:08+0200\n"
-"PO-Revision-Date: 2013-04-10 16:50+0000\n"
-"Last-Translator: Sung Jin Gang <potopro@gmail.com>\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"
 "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"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 3699d0cb0ba170c0f001f18cc63f8dba60d56d34..e03ae40de3d9cbe4a089bf3a7b5acb4d8144f640 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Park Shinjo <kde@peremen.name>, 2013.
-# Shinjo Park <kde@peremen.name>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -20,47 +17,47 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "도움말"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "개인"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "설정"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "사용자"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "앱"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "관리자"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP 다운로드가 비활성화되었습니다."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "파일을 개별적으로 다운로드해야 합니다."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "파일로 돌아가기"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "선택한 파일들은 ZIP 파일을 생성하기에 너무 큽니다."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "결정할 수 없음"
 
@@ -96,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -242,19 +239,6 @@ msgstr "ìž‘ë…„"
 msgid "years ago"
 msgstr "ë…„ ì „"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s을(를) 사용할 수 있습니다. <a href=\"%s\">자세한 정보 보기</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "최신"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "업데이트 확인이 비활성화됨"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 542bf452f7b27bc2be016db2ddd37fcc4e12379c..b546ec16d2e46ade3ea79fbbe6f302571cb8760a 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aoiob4305@gmail.com>, 2013.
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Harim Park <fofwisdom@gmail.com>, 2013.
-#   <limonade83@gmail.com>, 2012.
-# Shinjo Park <kde@peremen.name>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:09+0200\n"
-"PO-Revision-Date: 2013-04-10 17:00+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "인증 오류"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -99,7 +98,7 @@ msgstr "비활성화"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "활성화"
+msgstr "사용함"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -121,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "저장 중..."
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr "삭제"
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "되돌리기"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "그룹"
 
-#: js/users.js:91 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "그룹 관리자"
 
-#: js/users.js:111 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "삭제"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -236,7 +235,7 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "크론"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
@@ -311,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "로그"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "로그 단계"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "덜 중요함"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,7 +399,7 @@ msgstr "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다."
 msgid "Show First Run Wizard again"
 msgstr "첫 실행 마법사 다시 보이기"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "암호"
 
@@ -424,82 +423,74 @@ msgstr "새 암호"
 msgid "Change password"
 msgstr "암호 변경"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "표시 이름"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "이메일"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "이메일 주소"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "언어"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오."
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "로그인 이름"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "만들기"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "기본 저장소"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "무제한"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "기타"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "저장소"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "표시 이름 변경"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "새 암호 설정"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index ad02f58dde807129ea145aa85fdef660756caa4f..c778c7bcac81c74e42b096622abe051037c147d0 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aoiob4305@gmail.com>, 2013.
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Harim Park <fofwisdom@gmail.com>, 2013.
-# Shinjo Park <kde@peremen.name>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +17,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -57,281 +57,363 @@ msgstr "설정을 유지합니까?"
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "연결 시험 실패"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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 "<b>경고:</b> user_ldap 앱과 user_webdavauth 앱은 호환되지 않습니다. 오동작을 일으킬 수 있으므로, 시스템 관리자에게 요청하여 둘 중 하나만 사용하도록 하십시오."
 
-#: templates/settings.php:11
+#: 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 "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "호스트"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "기본 DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "사용자 DN"
 
-#: templates/settings.php:45
+#: 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 "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "암호"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "사용자 로그인 필터"
 
-#: templates/settings.php:53
+#: 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 "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "사용자 목록 필터"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "그룹 필터"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "연결 설정"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "구성 활성화"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "포트"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "백업 (복제) 포트"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "주 서버 비활성화"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS 사용"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL 인증서 유효성 검사를 해제합니다."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "추천하지 않음, 테스트로만 사용하십시오."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "디렉토리 설정"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "사용자의 표시 이름 필드"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "기본 사용자 트리"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "사용자 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "사용자 검색 속성"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "그룹의 표시 이름 필드"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "기본 그룹 트리"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "그룹 기본 DN을 한 줄에 하나씩 입력하십시오"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "그룹 검색 속성"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "바이트"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "도움말"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index f10bd76454e5e8f5443a82f84cc71d8dfebdc422..07e03e883858a911f8b438b3d41f4f99579fdac7 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -3,16 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aoiob4305@gmail.com>, 2013.
-# 남자사람  <cessnagi@gmail.com>, 2012.
-# Park Shinjo <kde@peremen.name>, 2013.
+# aoiob4305 <aoiob4305@gmail.com>, 2013
+# aoiob4305 <aoiob4305@gmail.com>, 2013
+# 남자사람 <cessnagi@gmail.com>, 2012
+# 남자사람 <cessnagi@gmail.com>, 2012
+# Shinjo Park <kde@peremen.name>, 2013
+# 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-01-31 17:02+0100\n"
-"PO-Revision-Date: 2013-01-31 08:10+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "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"
@@ -28,7 +31,7 @@ msgstr "WebDAV 인증"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index f015f7cd6960b1b33ad2ecdc1bf135a97eb4976b..486fbc1a3bd91ff3108d4b23cceb3e57d0bd5fb8 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <itkurd0@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -294,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
@@ -397,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "ناوی به‌کارهێنه‌ر"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -520,37 +526,37 @@ msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
 msgid "Data folder"
 msgstr "زانیاری فۆڵده‌ر"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "به‌كارهێنه‌ری داتابه‌یس"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "وشه‌ی نهێنی داتا به‌یس"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ناوی داتابه‌یس"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "هۆستی داتابه‌یس"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
@@ -558,37 +564,42 @@ msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 msgid "web services under your control"
 msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 1aade6ed34e38464fc897e5c1d67950e367976fe..1c9a37e3082fe821cd420b6051335132b8cb0a7c 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "بارکردن"
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index 25da3eec3afd9567186f2759b49c4c8eb826fab8..c8090c00e4432c9917d4d4641b683185585e2bf1 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hozha Koyi <hozhan@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "پاشکه‌وتده‌کات..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "هیچ"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 40a38765f0ba7663f375c55de542cc597f043814..39319cbb041c334998dcc4f51b25a468af34175a 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index daa1ed36ce9bf4fdccd0b32de6b420eba4ecc2d9..66f5b470e8466ad446705744c4ac08dccf49f122 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hozha Koyi <hozhan@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-10-07 00:05+0000\n"
-"Last-Translator: Hozha Koyi <hozhan@gmail.com>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "تێپه‌ڕه‌وشه"
+msgstr "وشەی تێپەربو"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr "ناردن"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
 
-#: templates/public.php:35
+#: 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 5329cb538e31b44f2c10bd57f605e5079ceccf69..599e316a48208e5aa35802cff9768736bda9ab0e 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -39,31 +39,31 @@ msgstr "هه‌ڵه"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "ناو"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index d5bfd4c337f4098fda7a9a7f7f5fd42bc71e17e7..65c39e334385b96025e893d3f7d5c5478a6f8ef7 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hozha Koyi <hozhan@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +40,17 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 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"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 597d8b750967bb049ad2323ea66925cdf45df0b2..5c9d4bdee21e9adf9bcbef01caf66b50f211563c 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "یارمەتی"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "به‌رنامه‌كان"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 6a7ca7f418f70bd751a46edde3b026475b9a47dd..e2f4cbba3991624d05cbf7e4d3e4f2220839560a 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -116,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
@@ -419,82 +423,74 @@ msgstr "وشەی نهێنی نوێ"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "ئیمه‌یل"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 0e3bf045fa26e14704dbcd29e8e616f93bef46c0..f49698d4ef6d263dae1a9ffb6f30d56aaa546aa8 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "وشەی تێپەربو"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "یارمەتی"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index 313845a14b2bd9718456ba7921a65ce8474d3d1f..381e788ea49473987a60fc86a1e40c9fb4b72114 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 1963026ba349be01dcae902586a65a8e79cf3d4a..8aa520b6742030238b4a7eade78b8af94bc085fe 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <sim0n@trypill.org>, 2013.
-#   <sim0n@trypill.org>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -162,75 +160,79 @@ msgstr "Dezember"
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "vrun 1 Stonn"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "vru {hours} Stonnen"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "Läschte Mount"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "vru {months} Méint"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "Méint hier"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "Läscht Joer"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "Joren hier"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Auswielen"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nee"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nee"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -295,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passwuert"
 
@@ -398,24 +400,27 @@ msgstr "ownCloud Passwuert reset"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Benotz folgende Link fir däi Passwuert ze reseten: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Benotzernumm"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Reset ufroen"
 
@@ -469,7 +474,7 @@ msgstr "Kategorien editéieren"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "Bäisetzen"
+msgstr "Dobäisetzen"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -521,37 +526,37 @@ msgstr "Avancéiert"
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Datebank konfiguréieren"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "wärt benotzt ginn"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datebank Tabelle-Gréisst"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
@@ -559,37 +564,42 @@ msgstr "Installatioun ofschléissen"
 msgid "web services under your control"
 msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Ausloggen"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "verhalen"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Log dech an"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 149e993376590688ea297f3918d68c4adb127449..9eded80484030f717f46ac016fd1d63f5d7366ff 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -57,7 +52,7 @@ msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Et ass keng Datei ropgelueden ginn"
+msgstr "Et ass kee Fichier ropgeluede ginn"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -79,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Deelen"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Eroplueden"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Eroflueden"
+msgstr "Download"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Momentane Scan"
 
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 6705693de91df00da7c2573070ba095e813f58f1..304094fcb33bd3053fb3eed4a3759d62c98e2a92 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Speicheren..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 4a9bd53d5c20a999067fee31ca1aee7241cbcd29..18c7b57b885f36e71a4fa577858e5fb24725e5ba 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
@@ -92,7 +99,7 @@ msgstr "Gruppen"
 
 #: templates/settings.php:100
 msgid "Users"
-msgstr ""
+msgstr "Benotzer"
 
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index f4d8ed5cc8e85775441ca990017684a46740a213..a780767eb6b9874eaef729a98a0d1caa3e560662 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-01-27 00:04+0100\n"
-"PO-Revision-Date: 2013-01-26 13:36+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -23,9 +23,9 @@ msgstr "Passwuert"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Fortschécken"
 
-#: templates/public.php:11
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
@@ -35,14 +35,14 @@ msgstr ""
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:16 templates/public.php:32
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Download"
 
-#: templates/public.php:31
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "Web Servicer ënnert denger Kontroll"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index dca63133d8ac9f95df959587bcd3171eaa665395..d6bca58aa1ac43244ffa1dce0de06acb1b067308 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fehler"
 
@@ -39,31 +39,31 @@ msgstr "Fehler"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Numm"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index c820aa4669e61102e6d8eae49273f0e2c8ac3e39..8c2aad478e12eb1ee92d1d91f5d0990a68e6427f 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <sim0n@trypill.org>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index ee8465ae6f85cc141d36e3e783cb0f1fc31c5824..f667ec07ad6e026d2072a979be9405ca0832a40e 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hëllef"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Astellungen"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
-msgstr ""
+msgstr "Benotzer"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "Applicatiounen"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr "Läscht Joer"
 msgid "years ago"
 msgstr "Joren hier"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index c49b6ae351edc6d72bfd7b4ed5faed08ceafe122..5fb1196d33f7a43b126169e8e1ceea4d859fb057 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Konnt Lescht net vum App Store lueden"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Authentifikatioun's Fehler"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "geläscht"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppen Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -232,7 +235,7 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
@@ -256,15 +259,15 @@ msgstr ""
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Share API aschalten"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Erlab Apps d'Share API ze benotzen"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Links erlaben"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
@@ -272,7 +275,7 @@ msgstr ""
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Resharing erlaben"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
@@ -280,11 +283,11 @@ msgstr ""
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Useren erlaben mat egal wiem ze sharen"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -307,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "Méi"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Passwuert"
 
@@ -420,82 +423,74 @@ msgstr "Neit Passwuert"
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 8e3b5b7e3124018ab5a2512710687c1401e596b4..e89f5d783070dfdc7ff07b76ae13dbb369885648 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fehler"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hëllef"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index fb53f7bcb242265334ddc4ae78f4ad953e2887fc..1bceab60dbff5a605bccbfb6d2900a7918e8b081 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index c953a0270a7cd6061912a2732beeef8f7fff2fd1..2e3943062ee26373cd2864ee33a0fc6a4fc2f06f 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <andrejuszl@gmail.com>, 2012.
-# Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
+# Roman Deniobe <rms200x@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
+"Last-Translator: Roman Deniobe <rms200x@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"
@@ -22,12 +21,12 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Vartotojas %s pasidalino su jumis failu"
 
 #: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Vartotojas %s su jumis pasidalino aplanku"
 
 #: ajax/share.php:101
 #, php-format
@@ -162,75 +161,79 @@ msgstr "Gruodis"
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "Prieš {count} minutes"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "Prieš {days}  dienas"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "prieš metus"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Pasirinkite"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Taip"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ne"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Gerai"
 
@@ -295,7 +298,7 @@ msgstr "Dalintis nuoroda"
 msgid "Password protect"
 msgstr "Apsaugotas slaptažodžiu"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -333,7 +336,7 @@ msgstr "Pasidalino {item} su {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Nesidalinti"
+msgstr "Nebesidalinti"
 
 #: js/share.js:320
 msgid "can edit"
@@ -398,24 +401,27 @@ msgstr "ownCloud slaptažodžio atkūrimas"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Slaptažodio atkūrimui naudokite šią nuorodą: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Prisijungimo vardas"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Prašyti nustatymo iš najo"
 
@@ -521,37 +527,37 @@ msgstr "IÅ¡plÄ—stiniai"
 msgid "Data folder"
 msgstr "Duomenų katalogas"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nustatyti duomenų bazę"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "bus naudojama"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Duomenų bazės vartotojas"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Duomenų bazės slaptažodis"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Duomenų bazės pavadinimas"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Duomenų bazės loginis saugojimas"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Duomenų bazės serveris"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Baigti diegimÄ…"
 
@@ -559,37 +565,42 @@ msgstr "Baigti diegimÄ…"
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatinis prisijungimas atmestas!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "prisiminti"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index b32048b7e663ae64231acda637afc3b0526faa31..b6f58efbe5d3bb2d8f7348908582e91c99a92288 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <andrejuszl@gmail.com>, 2012.
-# Denisas Kulumbegašvili <>, 2012.
-# Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -30,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "Klaidų nėra, failas įkeltas sėkmingai"
+msgstr "Failas įkeltas sėkmingai, be klaidų"
 
 #: ajax/upload.php:27
 msgid ""
@@ -51,7 +44,7 @@ msgstr ""
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE parametrą, kuris yra nustatytas HTML formoje"
+msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -59,7 +52,7 @@ msgstr "Failas buvo įkeltas tik dalinai"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Nebuvo įkeltas nė vienas failas"
+msgstr "Nebuvo įkeltas joks failas"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -81,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "Failai"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Dalintis"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "pasiūlyti pavadinimą"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "įkeliamas 1 failas"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -155,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Klaida"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} failai"
 
+#: 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 "Įkelti"
@@ -278,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
+msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
 
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 2e398b6292a5689094aa76fe367ee4934d5ce699..8d1d63c95a12c4a39458bb8963d50dca7a858dbf 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Saugoma..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Å ifravimas"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nieko"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 690cb476226b3d7c1afb559e42311de2e9783e19..f84b40b00656b98260fe1feb0e6235f1852af59c 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <andrejuszl@gmail.com>, 2012.
-# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
-# Mindaugas <min2lizz@gmail.com>, 2013.
+# Min2liz <min2lizz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -40,19 +38,26 @@ msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
 msgid "Error configuring Google Drive storage"
 msgstr "Klaida nustatinÄ—jant Google Drive talpyklÄ…"
 
-#: lib/config.php:423
+#: 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 "<b>Įspėjimas:</b> \"smbclient\" nėra įdiegtas. CIFS/SMB dalinimasis nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas \"smbclient\""
 
-#: lib/config.php:426
+#: 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 "<b>Įspėjimas:</b> FTP palaikymas PHP sistemoje nėra įjungtas arba nėra įdiegtas.  FTP dalinimosi įjungimas nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas FTP palaikymas. "
 
+#: 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 "<b>Įspėjimas:</b> \"Curl\" palaikymas PHP terpėje nėra įjungtas arba įdiegtas. ownCloud/WebDAV ar GoogleDrive įjungimas nebus įmanomas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas arba įjungtas \"Curl\" palaikymas."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "IÅ¡orinÄ—s saugyklos"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index e6c1c3865f082d59ba3698bf5aeed4ae74422cfd..9a9fe7aa1a0480efa41306c9f4f22a87707816fd 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "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,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Slaptažodis"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "IÅ¡saugoti"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Atsisiųsti"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "jūsų valdomos web paslaugos"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 9063682e9ad26a45af787d0c48e01f072b2ecf13..6b009b4a122cd81f1fd3c0bbfb018be42b47a8eb 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Klaida"
 
@@ -39,31 +39,31 @@ msgstr "Klaida"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} failai"
 
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index f43ae71f842504315976239ebd36200c863dfaaf..393a714fb588b06acbfab9f11d531d8556234b6d 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <andrejuszl@gmail.com>, 2012.
-# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
-# Mindaugas <min2lizz@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 06:10+0000\n"
-"Last-Translator: Min2liz <min2lizz@gmail.com>\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"
 "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"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 010c61df3bc037468cfc07063120e12f9d3539d4..940183f09e13dd18769489e4d675c3a561070a4d 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <andrejuszl@gmail.com>, 2012.
-# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Pagalba"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Vartotojai"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Programos"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administravimas"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -95,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,83 +113,87 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "prieš kelias sekundes"
+msgstr "prieš sekundę"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "prieš 1 minutę"
+msgstr "Prieš 1 minutę"
 
 #: template.php:115
 #, php-format
@@ -226,7 +224,7 @@ msgstr "prieš %d dienų"
 
 #: template.php:121
 msgid "last month"
-msgstr "praėjusį mėnesį"
+msgstr "praeitą mėnesį"
 
 #: template.php:122
 #, php-format
@@ -235,25 +233,12 @@ msgstr ""
 
 #: template.php:123
 msgid "last year"
-msgstr "pereitais metais"
+msgstr "praeitais metais"
 
 #: template.php:124
 msgid "years ago"
 msgstr "prieš metus"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s yra galimas. Platesnė <a href=\"%s\">informacija čia</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "pilnai atnaujinta"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "atnaujinimų tikrinimas išjungtas"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 3d3f85dbfa5e2962279a294e72e6b51a12278516..640edcbf5f201ff0efbd2d1ec7523ce3271bfc77 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <andrejuszl@gmail.com>, 2012.
-# Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentikacijos klaida"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -118,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Saugoma.."
+msgstr "Saugoma..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "GrupÄ—s"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -233,7 +235,7 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
@@ -253,7 +255,7 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Dalijimasis"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
@@ -308,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Žurnalas"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -397,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -421,82 +423,74 @@ msgstr "Naujas slaptažodis"
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "El. paštas"
+msgstr "El. Paštas"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Sukurti"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 28684ff33e67f4a648a304edad45d4bac24105a9..92110398949cd6f4f1968fa006d0af199da3de4a 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Klaida"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "GrupÄ—s filtras"
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Naudoti TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "IÅ¡jungti SSL sertifikato tikrinimÄ…."
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nerekomenduojama, naudokite tik testavimui."
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 2801133d596f1ee7559d6ad898e6ab5772f2934a..173f9167f2b25728d9f4ca67d2ba9819574d446f 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mindaugas <min2lizz@gmail.com>, 2013.
+# Min2liz <min2lizz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 06:00+0000\n"
-"Last-Translator: Min2liz <min2lizz@gmail.com>\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"
 "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"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 8e5cc66cb512ee606675faf863224266b86f2417..faf617a89464d01a56ff021e7b0c904d2614af7a 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aldis@udris.lv>, 2012.
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +73,7 @@ msgstr "Kļūda, pievienojot %s izlasei."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Neviena kategorija nav izvēlēta dzēšanai"
+msgstr "Neviena kategorija nav izvēlēta dzēšanai."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -162,75 +160,79 @@ msgstr "Decembris"
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pirms 1 minūtes"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pirms {minutes} minūtēm"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "pirms 1 stundas"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "pirms {hours} stundām"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "Å¡odien"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pirms {days} dienām"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "pirms {months} mēnešiem"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Izvēlieties"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "NÄ“"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Jā"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "NÄ“"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Labi"
 
@@ -295,7 +297,7 @@ msgstr "Dalīties ar saiti"
 msgid "Password protect"
 msgstr "Aizsargāt ar paroli"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parole"
 
@@ -333,7 +335,7 @@ msgstr "Dalījās ar {item} ar {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Beigt dalīties"
+msgstr "Pārtraukt dalīšanos"
 
 #: js/share.js:320
 msgid "can edit"
@@ -398,24 +400,27 @@ msgstr "ownCloud paroles maiņa"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Izmantojiet šo saiti, lai mainītu paroli: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli."
+#: 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:5
-msgid "Reset email send."
-msgstr "Atstatīt e-pasta sūtīšanu."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Pieprasījums neizdevās!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Lietotājvārds"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Pieprasīt paroles maiņu"
 
@@ -449,7 +454,7 @@ msgstr "Lietotnes"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrators"
+msgstr "Administratori"
 
 #: strings.php:9
 msgid "Help"
@@ -521,37 +526,37 @@ msgstr "Paplašināti"
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurēt datubāzi"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "tiks izmantots"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Datubāzes nosaukums"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Datubāzes tabulas telpa"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Datubāzes serveris"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Pabeigt iestatīšanu"
 
@@ -559,37 +564,42 @@ msgstr "Pabeigt iestatīšanu"
 msgid "web services under your control"
 msgstr "tīmekļa servisi tavā varā"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Izrakstīties"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automātiskā ierakstīšanās ir noraidīta!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Lūdzu, nomainiet savu paroli, lai atkal nodrošinātu savu kontu."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "atcerēties"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Ierakstīties"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternatīvās pieteikšanās"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index ee10faffe101e020bee064fb329e9cc1618d3156..61cd8e91c5a3a312c0050be6dd71f50cd86aa9d6 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aldis@udris.lv>, 2012.
-# Imants Liepiņš <imzzinator@gmail.com>, 2012.
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -30,17 +27,13 @@ msgstr "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu"
 msgid "Could not move %s"
 msgstr "Nevarēja pārvietot %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nevarēja pārsaukt datni"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Netika augšupielādēta neviena datne. Nezināma kļūda"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Augšupielāde pabeigta bez kļūdām"
+msgstr "Viss kārtībā, datne augšupielādēta veiksmīga"
 
 #: ajax/upload.php:27
 msgid ""
@@ -81,55 +74,59 @@ msgstr "Nederīga direktorija."
 msgid "Files"
 msgstr "Datnes"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Dalīties"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Dzēst"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "ieteiktais nosaukums"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "veikt dzēšanas darbību"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Augšupielādē 1 datni"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -155,69 +152,77 @@ msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tās izmērs ir 0 baiti"
+msgstr "Nevar augšupielādēt jūsu datni, jo tā ir direktorija vai arī tā ir 0 baitu liela"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nepietiek brīvas vietas"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nevar būt tukšs."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} datnes"
 
+#: 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 "Nevarēja pārsaukt datni"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Augšupielādēt"
@@ -278,37 +283,37 @@ msgstr "Dzēstās datnes"
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Jums nav tiesību šeit rakstīt."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
 
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 845062cf87778dfcdba1c07b1d57b51366bc2a3d..4d1d0d415bd0c1690e6bcd15f237f7fadf4e0221 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Saglabā..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Datņu šifrēšana ir aktivēta."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Sekojošās datnes netiks šifrētas:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Sekojošos datņu tipus izslēgt no šifrēšanas:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nav"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index b1227556c329496c80713704440a9cf067f1e787..56e4020ed1bbc83f1c3c2832323359fcbb05366b 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,19 +37,26 @@ msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
 msgid "Error configuring Google Drive storage"
 msgstr "Kļūda, konfigurējot Google Drive krātuvi"
 
-#: lib/config.php:423
+#: 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 "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
 
-#: lib/config.php:426
+#: 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 "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
 
+#: 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 "Ārējā krātuve"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 46609775b6990506677c580277a4785c4c1d375f..363900d1c5ead9f19f5416c8bdbbb081602b08e4 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-16 22:17+0100\n"
-"PO-Revision-Date: 2013-03-15 17:00+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,14 +35,14 @@ msgstr "%s ar jums dalījās ar mapi %s"
 msgid "%s shared the file %s with you"
 msgstr "%s ar jums dalījās ar datni %s"
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nav pieejams priekšskatījums priekš"
 
-#: templates/public.php:43
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr "jūsu vadībā esošie tīmekļa servisi"
+msgstr "tīmekļa servisi tavā varā"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index b3252d40d1ae2737be277fbaf6ce506bbdae9a98..296e6d2c0cd803b132b0677d94457b3680049120 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Nevarēja pilnībā izdzēst %s"
 msgid "Couldn't restore %s"
 msgstr "Nevarēja atjaunot %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "veikt atjaunošanu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Kļūda"
 
@@ -40,31 +39,31 @@ msgstr "Kļūda"
 msgid "delete file permanently"
 msgstr "dzēst datni pavisam"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} datnes"
 
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index cfbdfa3db8fb28efb46f01c5e7065e4505504e9b..440afe984ad8047dd84e45ab87ca079daaf49cde 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 20:50+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,11 +40,11 @@ msgstr "neveiksme"
 msgid "File %s could not be reverted to version %s"
 msgstr "Datni %s nevarēja atgriezt uz versiju %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Nav pieejamu vecāku versiju"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nav norādīts ceļš"
 
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 6511559d5ed1051f2df0b71c640046dee5b3495e..b26d7786611392ca093225413027c06452e61c05 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\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: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Palīdzība"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personīgi"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Lietotāji"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Lietotnes"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administratori"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielādēšana ir izslēgta."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Datnes var lejupielādēt tikai katru atsevišķi."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Atpakaļ pie datnēm"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Izvēlētās datnes ir pārāk lielas, lai izveidotu zip datni."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nevarēja noteikt"
 
@@ -94,10 +93,6 @@ msgstr "Iestatiet administratora lietotājvārdu."
 msgid "Set an admin password."
 msgstr "Iestatiet administratora paroli."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Norādiet datu mapi."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nav derīga PostgreSQL parole un/vai lietotājvārds"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nav derīga MySQL parole un/vai lietotājvārds"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB kļūda — “%s”"
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Vainīgā komanda bija “%s”"
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL lietotājs %s'@'localhost' jau eksistē."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Izmest šo lietotāju no MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL lietotājs '%s'@'%%' jau eksistē"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Izmest šo lietotāju no MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
@@ -240,19 +239,6 @@ msgstr "gājušajā gadā"
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s ir pieejams. Iegūt <a href=\"%s\">vairāk informācijas</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ir aktuāls"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "atjauninājumu pārbaude ir deaktivēta"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 18644f7fb0ba13461cbf673ca96c5adcecf26a9a..8ac181d5882ee50dcadb5ba4201b94dfea4721a4 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <aldis@udris.lv>, 2012.
-#   <elwins@inbox.lv>, 2012.
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nevar lejupielādēt sarakstu no lietotņu veikala"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Autentifikācijas kļūda"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Nevarēja mainīt redzamo vārdu"
 
@@ -67,7 +68,7 @@ msgstr "Valoda tika nomainīta"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Nederīgs pieprasījums"
+msgstr "Nederīgs vaicājums"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -119,52 +120,52 @@ msgstr "Kļūda, atjauninot lietotni"
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Saglabā..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "izdzests"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nevar izņemt lietotāju"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupas"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupas administrators"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Dzēst"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "pievienot grupu"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Jānorāda derīgs lietotājvārds"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Kļūda, veidojot lietotāju"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Jānorāda derīga parole"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -315,19 +316,19 @@ msgstr "Žurnāls"
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Parole"
 
@@ -422,82 +423,74 @@ msgstr "Jauna parole"
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Redzamais vārds"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Jūsu redzamais vārds tika mainīts"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Nevarēja mainīt jūsu redzamo vārdu"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Mainīt redzamo vārdu"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "JÅ«su e-pasta adrese"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Ierakstīšanās vārds"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Izveidot"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Noklusējuma krātuve"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Neierobežota"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Krātuve"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "mainīt redzamo vārdu"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "iestatīt jaunu paroli"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 442b097a56783f20e00ba8dbeaa9cd40dd351441..45460c20e1304c707f42539a2a6ba647b38a877c 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 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 "Neizdevās izdzēst servera konfigurāciju"
@@ -54,281 +57,363 @@ msgstr "Paturēt iestatījumus?"
 msgid "Cannot add server configuration"
 msgstr "Nevar pievienot servera konfigurāciju"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Kļūda"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Savienojuma tests ir veiksmīgs"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Savienojuma tests cieta neveiksmi"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Apstiprināt dzēšanu"
 
-#: templates/settings.php:8
+#: 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 "<b>Brīdinājums:</b> lietotnes user_ldap un user_webdavauth ir nesavietojamas. Tās var izraisīt negaidītu uzvedību. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt."
 
-#: templates/settings.php:11
+#: 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 "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Servera konfigurācija"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Pievienot servera konfigurāciju"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Resursdators"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Bāzes DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Viena bāzes DN rindā"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Lietotāja DN"
 
-#: templates/settings.php:45
+#: 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 "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parole"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Lietotāja ierakstīšanās filtrs"
 
-#: templates/settings.php:53
+#: 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 "Definē filtru, ko izmantot, kad mēģina ierakstīties. %%uid ierakstīšanās darbībā aizstāj lietotājvārdu."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lietotāju saraksta filtrs"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definē filtru, ko izmantot, kad saņem lietotāju sarakstu."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupu filtrs"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez jebkādiem vietturiem, piemēram, \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Savienojuma iestatījumi"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurācija ir aktīva"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ja nav atzīmēts, šī konfigurācija tiks izlaista."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Ports"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Rezerves (kopija) serveris"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Rezerves (kopijas) ports"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deaktivēt galveno serveri"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Kad ieslēgts, ownCloud savienosies tikai ar kopijas serveri."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Lietot TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrādās."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Izslēgt SSL sertifikātu validēšanu."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ja savienojums darbojas ar šo opciju, importē LDAP serveru SSL sertifikātu savā ownCloud serverī."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nav ieteicams, izmanto tikai testēšanai!"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Kešatmiņas dzīvlaiks"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Direktorijas iestatījumi"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Lietotāja redzamā vārda lauks"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP atribūts, ko izmantot lietotāja ownCloud vārda veidošanai."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Bāzes lietotāju koks"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Viena lietotāju bāzes DN rindā"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Lietotāju meklēšanas atribūts"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Neobligāti; viens atribūts rindā"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Grupas redzamā nosaukuma lauks"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP atribūts, ko izmantot grupas ownCloud nosaukuma veidošanai."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Bāzes grupu koks"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Viena grupu bāzes DN rindā"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupu meklēšanas atribūts"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grupu piederības asociācija"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Īpašie atribūti"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kvotu lauks"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Kvotas noklusējums"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-pasta lauks"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
 
-#: templates/settings.php:99
+#: 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 "Testa konfigurācija"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Palīdzība"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index bac06d9c1e37e0c6f4461bf09b87690c1af4896f..bc46877310002c92c422d85ed2ee1ed6d741aeb2 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013.
+# RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-05 00:19+0100\n"
-"PO-Revision-Date: 2013-02-04 11:30+0000\n"
-"Last-Translator: RÅ«dolfs Mazurs <rudolfs.mazurs@gmail.com>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index d217e5335d0019f9b664950292e9433834966e66..d9fb1012ae24debced829e1a8b0cc59b81ac2d9f 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
-# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
-# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -161,77 +158,81 @@ msgstr "Декември"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Поставки"
+msgstr "Подесувања"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "пред 1 минута"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "пред {minutes} минути"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "пред 1 час"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "пред {hours} часови"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "пред {days} денови"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "пред {months} месеци"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "пред години"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Избери"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Откажи"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Не"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Не"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Во ред"
 
@@ -296,7 +297,7 @@ msgstr "Сподели со врска"
 msgid "Password protect"
 msgstr "Заштити со лозинка"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Лозинка"
 
@@ -399,24 +400,27 @@ msgstr "ресетирање на лозинка за ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "Порката за ресетирање на лозинка пратена."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Барањето не успеа!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Корисничко име"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Побарајте ресетирање"
 
@@ -446,7 +450,7 @@ msgstr "Корисници"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Апликации"
+msgstr "Аппликации"
 
 #: strings.php:8
 msgid "Admin"
@@ -522,37 +526,37 @@ msgstr "Напредно"
 msgid "Data folder"
 msgstr "Фолдер со податоци"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Конфигурирај ја базата"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Корисник на база"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Лозинка на база"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Име на база"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Табела во базата на податоци"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Сервер со база"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
@@ -560,37 +564,42 @@ msgstr "Заврши го подесувањето"
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Одбиена автоматска најава!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Ве молам сменете ја лозинката да ја обезбедите вашата сметка повторно."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "запамти"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Најава"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 438739bdf0d280660b40acd46a4c978584cf3e51..2a907e8064f383cac94519c9e5ae271e4646011c 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
-# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
-# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -30,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "Нема грешка, датотеката беше подигната успешно"
+msgstr "Датотеката беше успешно подигната."
 
 #: ajax/upload.php:27
 msgid ""
@@ -51,7 +44,7 @@ msgstr "Подигнатата датотека ја надминува upload_m
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Подигнатата датотеката ја надминува MAX_FILE_SIZE директивата која беше поставена во HTML формата"
+msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -59,11 +52,11 @@ msgstr "Датотеката беше само делумно подигната
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Не беше подигната датотека"
+msgstr "Не беше подигната датотека."
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Не постои привремена папка"
+msgstr "Недостасува привремена папка"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -81,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Сподели"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "предложи име"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 датотека се подига"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -155,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Адресата неможе да биде празна."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} датотеки"
 
+#: 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 "Подигни"
@@ -278,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Датотеката е премногу голема"
+msgstr "Фајлот кој се вчитува е преголем"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Моментално скенирам"
 
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 3eab97885bd975b38368d60a7f71db0f30e93b8f..5ccdc506c2ca4bb5bef6e8ddb996c0f950dd7c8f 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Снимам..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ништо"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 0ea4caf77c3b280f70845e245d231aa2dc6bf524..6da9a4c5b4bc6af00fca944a4d770cc6abd22e87 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +37,26 @@ msgstr "Ве молам доставите валиден Dropbox клуч и т
 msgid "Error configuring Google Drive storage"
 msgstr "Грешка при конфигурација на Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира."
 
-#: lib/config.php:426
+#: 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 "<b>Внимание:</b> Не е овозможена или инсталирани FTP подршка во PHP. Не е можно монтирање на FTP дискови. Замолете го Вашиот систем администратор да го инсталира."
 
+#: 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 "Надворешно складиште"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 51205c77b2caf5536d95c31d6f2a077f4807e15b..1cf38e52a3d70eaec61883eefa614d349c7c3095 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:31+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,24 +25,24 @@ msgstr "Лозинка"
 msgid "Submit"
 msgstr "Прати"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ја сподели папката %s со Вас"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ја сподели датотеката %s со Вас"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Нема достапно преглед за"
 
-#: templates/public.php:43
+#: 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 c053571e8f75840d00b66093d1b53943beccce31..86dfbed28ae1f0edc6a07087297deb7580ac8805 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Грешка"
 
@@ -39,31 +39,31 @@ msgstr "Грешка"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} датотеки"
 
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index f79838b9c078c01798d14116ce501958209dc44e..0f4762644949780952c42bddc7d25036f28c8a28 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-27 23:20+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 3e18f0b9d01d9bde441e7501e72b782b8f42b1e3..102cf6bc2ba6df7b67737b1221453cb876f52c83 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Помош"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
-msgstr "Параметри"
+msgstr "Подесувања"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Аппликации"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Админ"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Преземање во ZIP е исклучено"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеките треба да се симнат една по една."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Назад кон датотеки"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Избраните датотеки се преголеми за да се генерира zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +239,6 @@ msgstr "минатата година"
 msgid "years ago"
 msgstr "пред години"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ажурно"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "проверката за ажурирања е оневозможена"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 9a2115e31977abfec348acd29c3b72cd3a906298..17ecb1aabfaceba12cb2db9c634c519c35ea9956 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
-# Miroslav Jovanovic <j.miroslav@gmail.com>, 2012.
-# Miroslav Jovanovic <jmiroslav@softhome.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Неможам да вчитам листа од App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Грешка во автентикација"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -67,7 +68,7 @@ msgstr "Јазикот е сменет"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "неправилно барање"
+msgstr "Неправилно барање"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -119,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Снимам..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "врати"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Администратор на група"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -309,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Записник"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Ниво на логирање"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Лозинка"
 
@@ -422,82 +423,74 @@ msgstr "Нова лозинка"
 msgid "Change password"
 msgstr "Смени лозинка"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Вашата адреса за е-пошта"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Јазик"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Користете ја оваа адреса да "
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Создај"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index e09b0f24403353ea58eba8d0878978735c6cefce..04e212b30e4f2db278a084c62d7417f50d599b32 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Домаќин"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помош"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 19b5d3df58ebf06cce6142f5704a6a1dbc9c7027..78f50a5abe44e8796dfe8dd40c2a83d54f121af6 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Georgi Stanojevski <glisha@gmail.com>, 2012.
+# Georgi Stanojevski <glisha@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index be9c3022f2d1c928fa2f7ee8102cd2bfafd96cf4..710a7a8ded771f4ba35860466812fe29021f63b0 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
-#   <hadri.hilmi@gmail.com>, 2011, 2012.
-# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +73,7 @@ msgstr ""
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "tiada kategori dipilih untuk penghapusan"
+msgstr "Tiada kategori dipilih untuk dibuang."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -163,75 +160,79 @@ msgstr "Disember"
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Batal"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Tidak"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ya"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Tidak"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -296,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kata laluan"
 
@@ -399,24 +400,27 @@ msgstr "Set semula kata lalaun ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Permintaan set semula"
 
@@ -466,7 +470,7 @@ msgstr "Awan tidak dijumpai"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Edit kategori"
+msgstr "Ubah kategori"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -522,37 +526,37 @@ msgstr "Maju"
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "akan digunakan"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Setup selesai"
 
@@ -560,37 +564,42 @@ msgstr "Setup selesai"
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Log keluar"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "ingat"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Log masuk"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 80ad8ecc885a974b660a9d68cdc9d0970941d7a2..e7b0357a3ce220b959f675fe7ae37b66b16df827 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
-#   <hadri.hilmi@gmail.com>, 2011, 2012.
-# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
-# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -31,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Tiada ralat, fail berjaya dimuat naik."
+msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
 #: ajax/upload.php:27
 msgid ""
@@ -52,19 +44,19 @@ msgstr ""
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
+msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Sebahagian daripada fail telah dimuat naik. "
+msgstr "Fail yang dimuatnaik tidak lengkap"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Tiada fail yang dimuat naik"
+msgstr "Tiada fail dimuatnaik"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Folder sementara hilang"
+msgstr "Direktori sementara hilang"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -80,57 +72,61 @@ msgstr ""
 
 #: appinfo/app.php:12
 msgid "Files"
-msgstr "fail"
+msgstr "Fail-fail"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Kongsi"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Padam"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -156,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Ralat"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Nama "
+msgstr "Nama"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Muat naik"
@@ -279,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Muat naik terlalu besar"
+msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Imbasan semasa"
 
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index b87b0fa030b53428cdc22f6f6ca0a954fb707e94..bbbe2f3aa5a83ec784e087ba855e6af074e7501c 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Simpan..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 898cd9062a2a31e1db32a164be33b7491bac7c67..36a6392e39a57316de49032c921c3e501d1945cc 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 6518fcc4c6b025ef7df96b80dab5fdea2dfec133..efab3f4042f4594bdd6803ba28cdcb4d3775a184 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Kata laluan"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Hantar"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Muat turun"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "Perkhidmatan web di bawah kawalan anda"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 60595c6bdd319c34da882eaf85771b1fd01cc495..f70d21e7140af2d0404bd8fd4b322fc29dbfa3ec 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Ralat"
 
@@ -39,31 +39,31 @@ msgstr "Ralat"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nama"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 5694a0b699af629cfe2b5cfd89be5d7dbd16648a..c76d0b2b739466fe46c5c9eba518156382529037 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 639a4ea571e5bafe0eabc9fa3118e00c63e1b4d3..aa33d98b4a39db4c4f955c7c36633dd4266a9797 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Peribadi"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Tetapan"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "Aplikasi"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 8be5b5d094a99d322ab1e6cdfd0c2ca3fb9e2eef..484e24be5935ff83d40ed17b908c18110570f202 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>, 2012.
-#   <hadri.hilmi@gmail.com>, 2011, 2012.
-# Hadri Hilmi <hadri.hilmi@gmail.com>, 2012.
-# Zulhilmi Rosnin <zulhilmi.rosnin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Ralat pengesahan"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -120,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Padam"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -310,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Tahap Log"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "Lanjutan"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,9 +399,9 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
-msgstr "Kata laluan "
+msgstr "Kata laluan"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -423,82 +423,74 @@ msgstr "Kata laluan baru"
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Emel"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 1fea18548a7ba79dfa3c6422022b2696192fb114..1df50e9ef62ea59024f6f7c0321088b75380789f 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Ralat"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Kata laluan"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Bantuan"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index 8e8f74d0a70447bcaee4504cc666b71106688ddc..acf08a184c102ca56b208050322485b83418e8c1 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 011e4893c00985ed8edf65f264338827335a21e8..ea59f428ab422cc5842b0c49d467c9c721a0eb9b 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pyae Sone <gipsyhnh@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:31+0000\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr "ဒီဇင်ဘာ"
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "၁ မိနစ်အရင်က"
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "၁ နာရီ အရင်က"
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "ရွေးချယ်"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr "ပယ်ဖျက်မည်"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "မဟုတ်ဘူး"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr "ဟုတ်"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr "မဟုတ်ဘူး"
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr "အိုကေ"
 
@@ -238,9 +241,11 @@ msgstr "အိုကေ"
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566
-#: js/share.js:578
+#: 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 ""
 
@@ -260,7 +265,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:606
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
@@ -292,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "စကားဝှက်"
 
@@ -320,59 +325,59 @@ msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
 
-#: js/share.js:276
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:320
 msgid "can edit"
 msgstr "ပြင်ဆင်နိုင်"
 
-#: js/share.js:311
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:314
+#: js/share.js:325
 msgid "create"
 msgstr "ဖန်တီးမည်"
 
-#: js/share.js:317
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:331
 msgid "delete"
 msgstr "ဖျက်မည်"
 
-#: js/share.js:323
+#: js/share.js:334
 msgid "share"
 msgstr "ဝေမျှမည်"
 
-#: js/share.js:357 js/share.js:553
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:566
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:578
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:593
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -395,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "သုံးစွဲသူအမည်"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -518,37 +526,37 @@ msgstr "အဆင့်မြင့်"
 msgid "Data folder"
 msgstr "အချက်အလက်ဖိုလ်ဒါလ်"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Database သုံးစွဲသူ"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Database စကားဝှက်"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Database အမည်"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
 
@@ -556,37 +564,42 @@ msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
 msgid "web services under your control"
 msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "မှတ်မိစေသည်"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "ဝင်ရောက်ရန်"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index b676717879a8aab067a2223afe418b6791b478fd..d9769ad9231f174954e683e285feadf9f5072971 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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "ဖိုင်များ"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index e6b714b2cb460fbd85c758c882e31530d92ae51b..876bedaf9148dc863b058196602aa99d90a8a015 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.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-02-21 00:14+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index 9d597dfe54579944d0c0377b7021337955c3e156..12ae346136a92075bd87d1e50461fd741e537a87 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index b960c995af19b0114235c3ac8feb258fceff3f68..0b655da998fc9aa895b577ce3f1704363f00aa82 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/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-02-27 14:34+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,14 +35,14 @@ msgstr ""
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index 191941cf5290270bcec1162f0ecd1aff69948dda..6c22f6131851e74ad1db201ebe8de1584cabd1bb 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_versions.po b/l10n/my_MM/files_versions.po
index 1bb8d9af22056ce56755ffeb0b6259f52943fb98..60f265294d1088304633d7c93421429c54cf17ea 100644
--- a/l10n/my_MM/files_versions.po
+++ b/l10n/my_MM/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 8201b63c014a7b678da26da07f8e197ff67e9b22..fed2bd8bf6100670c724129e3b02eec511ec1bd5 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Pyae Sone <gipsyhnh@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:10+0000\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "အကူအညီ"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "အက်ဒမင်"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "ဖိုင်သို့ပြန်သွားမည်"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "zip ဖိုင်အဖြစ်ပြုလုပ်ရန် ရွေးချယ်ထားသောဖိုင်များသည် အရမ်းကြီးလွန်းသည်"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "မဆုံးဖြတ်နိုင်ပါ။"
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +239,6 @@ msgstr "မနှစ်က"
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s ကိုရရှိနိုင်ပါပြီ။ <a href=\"%s\">နောက်ထပ်အချက်အလက်များ</a>ရယူပါ။"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "နောက်ဆုံးပေါ်"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "နောက်ဆုံးပေါ်စစ်ဆေးခြင်းကိုပိတ်ထားသည်"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 9d80882ae47bae5217f7854332226ccc55d27ee0..d80dc9bfb154e79d1cabb6874cd6323c509204bb 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "ခွင့်ပြုချက်မအောင်မြင်"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "စကားဝှက်"
 
@@ -419,82 +423,74 @@ msgstr "စကားဝှက်အသစ်"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 14b74ed4d5cb327e6b1ef8edf2f2759bf5227296..f5d26e3942c2384645cb5c9272fb4edbf4df04a5 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "အကူအညီ"
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
index 45d8ff660d388dd101717e231cf7dd418558d14f..51443b323f3065604691278a99a65b59ec8ac709 100644
--- a/l10n/my_MM/user_webdavauth.po
+++ b/l10n/my_MM/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-02-21 00:14+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 501db5e3a7a4bed96242d19386d78601d514a66c..e94e14b17589c664c66cff7cace6e349227eb503 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -3,19 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ajarmund@gmail.com>, 2011, 2012.
-# Christer Eriksson <post@hc3web.com>, 2012.
-# Daniel  <i18n@daniel.priv.no>, 2012.
-#   <espenbye@me.com>, 2012.
-#   <hdalgrav@gmail.com>, 2012.
-#   <itssmail@yahoo.no>, 2012.
-#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -167,75 +160,79 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} måneder siden"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Velg"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nei"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nei"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -300,7 +297,7 @@ msgstr "Del med link"
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
@@ -403,24 +400,27 @@ msgstr "Tilbakestill ownCloud passord"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Bruk følgende lenke for å tilbakestille passordet ditt: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Brukernavn"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Anmod tilbakestilling"
 
@@ -526,75 +526,80 @@ msgstr "Avansert"
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "vil bli brukt"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tabellområde"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "nettjenester under din kontroll"
+msgstr "web tjenester du kontrollerer"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk pålogging avvist!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 1e2cffa776b59c9d6f7b7d41f1e6fa0e1679390c..d3b6ec09dde7f2b4711d727bbd26b8b6b140b872 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ajarmund@gmail.com>, 2011, 2012.
-# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
-# Christer Eriksson <post@hc3web.com>, 2012.
-# Daniel  <i18n@daniel.priv.no>, 2012.
-#   <espenbye@me.com>, 2012.
-#   <hdalgrav@gmail.com>, 2012.
-#   <olamaekle@gmail.com>, 2012.
-#   <runesudden@gmail.com>, 2012.
-#   <sindre@haverstad.com>, 2012.
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,16 +21,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
+msgstr "Kunne ikke flytte %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -46,30 +34,30 @@ msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Det er ingen feil. Filen ble lastet opp."
+msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
 
 #: ajax/upload.php:29
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Filstørrelsen overskrider maksgrensen på MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
+msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Filopplastningen ble bare delvis gjennomført"
+msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Ingen fil ble lastet opp"
+msgstr "Ingen filer ble lastet opp"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Mangler en midlertidig mappe"
+msgstr "Mangler midlertidig mappe"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -77,75 +65,79 @@ msgstr "Klarte ikke å skrive til disk"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig katalog."
 
 #: appinfo/app.php:12
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Del"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Slett"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Omdøp"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "foreslå navn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "utfør sletting"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "filer lastes opp"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' er et ugyldig filnavn."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Filnavn kan ikke være tomt."
 
 #: js/files.js:64
 msgid ""
@@ -155,75 +147,83 @@ msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke ti
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Lagringsplass er nesten oppbruker ([usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Ikke nok lagringsplass"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke være tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kan ikke gi nytt navn"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Last opp"
@@ -278,46 +278,46 @@ msgstr "Fra link"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Slettet filer"
 
 #: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du har ikke skrivetilgang her."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Opplasting for stor"
+msgstr "Filen er for stor"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Pågående skanning"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Oppgraderer filsystemets  mellomlager..."
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 50026411075873ff84c3d091eea8778129e4e87f..0ff991d14d1128f0763d9bacbc3963d528fa5726 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
-#  <oyvind.hojem@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-06 15:13+0000\n"
-"Last-Translator: troll <oyvind.hojem@gmail.com>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Lagrer..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Fil-kryptering er aktivert."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Følgende filtyper vil ikke bli kryptert:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ekskluder følgende filtyper fra kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index a1b53760174d398d0048244d870254369e56d4cb..cdb5af275e92f76bd16555f2cc5e55b22c3f76a7 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ajarmund@gmail.com>, 2012.
-#  <oyvind.hojem@gmail.com>, 2013.
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: troll <oyvind.hojem@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,24 +32,31 @@ msgstr "Gi tilgang"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet."
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Feil med konfigurering av Google Drive"
 
-#: lib/config.php:423
+#: 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 ""
+msgstr "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det."
 
-#: lib/config.php:426
+#: 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 ""
+msgstr "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det."
+
+#: 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 "<b>Advarsel:</b> Curl støtte i PHP er ikke aktivert eller innstallert. Kan ikke montere owncloud/WebDAV eller Googledrive. Ta kontakt med din systemadministrator for å innstallerer det."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 8f4798597a079a1a6755cb7a9c93b7c48965550b..bc0f67466113df8cc4fc01bc191bf8490a2e6d8c 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
-#   <hdalgrav@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-31 00:01+0100\n"
-"PO-Revision-Date: 2012-10-30 12:47+0000\n"
-"Last-Translator: hdalgrav <hdalgrav@gmail.com>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,24 +25,24 @@ msgstr "Passord"
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delte mappen %s med deg"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delte filen %s med deg"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgjengelig for"
 
-#: templates/public.php:35
+#: 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 5fdfb52c7710970cd6bfd29c3528f36140a5e37c..605f48efbcb50ae2570b6e16de4899a0abddfcb7 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ivar Bredesen <ivar.bredesen@gmail.com>, 2013.
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr "Kunne ikke slette %s fullstendig"
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gjenopprette %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "utfør gjenopprettings operasjon"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Feil"
 
@@ -40,31 +40,31 @@ msgstr "Feil"
 msgid "delete file permanently"
 msgstr "slett filer permanent"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Slett permanent"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -82,4 +82,4 @@ msgstr "Slett"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Slettet filer"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index b918fa61b6b4e013e2b6d164d1e52c1299228182..0d1e2a829cd212faaee7e5d8c1ead7b573f1daa1 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
-#   <hdalgrav@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -42,17 +40,17 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versjoner"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 95403236ecfed8a5b966f5f0d48611348617253a..c799068e3c0b8163327a8d8d64723f271dde2a87 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
-#   <espenbye@me.com>, 2012.
-#   <hdalgrav@gmail.com>, 2012.
-#   <runesudden@gmail.com>, 2012.
-#   <sindre@haverstad.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -22,47 +17,47 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Brukere"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apper"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -72,7 +67,7 @@ msgstr "Applikasjon er ikke påslått"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Autentiseringsfeil"
+msgstr "Autentikasjonsfeil"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -98,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -122,75 +113,79 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -238,25 +233,12 @@ msgstr "%d måneder siden"
 
 #: template.php:123
 msgid "last year"
-msgstr "i fjor"
+msgstr "forrige år"
 
 #: template.php:124
 msgid "years ago"
 msgstr "Ã¥r siden"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s er tilgjengelig. FÃ¥  <a href=\"%s\">mer informasjon</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "oppdatert"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "versjonssjekk er avslått"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 8c84cd56077ea6aca8b0527d3a2786c50a203a3b..e19e1a0fcbd270f3df570617917545c94b44514f 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,20 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ajarmund@gmail.com>, 2011.
-# Arvid Nornes <arvid.nornes@gmail.com>, 2012.
-# Christer Eriksson <post@hc3web.com>, 2012.
-# Daniel  <i18n@daniel.priv.no>, 2012.
-#   <espenbye@me.com>, 2012.
-#   <hdalgrav@gmail.com>, 2012.
-#   <itssmail@yahoo.no>, 2012.
-#   <runesudden@gmail.com>, 2012.
+# Hans Nesse <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -29,14 +22,18 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
+msgstr "Autentiseringsfeil"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Ditt visningsnavn er blitt endret."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Kunne ikke endre visningsnavn"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -76,7 +73,7 @@ msgstr "Ugyldig forespørsel"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Admin kan ikke flytte seg selv fra admingruppen"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -90,11 +87,11 @@ msgstr "Kan ikke slette bruker fra gruppen %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Kunne ikke oppdatere app."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Oppdater til {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -102,11 +99,11 @@ msgstr "Slå avBehandle "
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Slå på"
+msgstr "Aktiver"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Vennligst vent..."
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -114,62 +111,62 @@ msgstr "Feil"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "Oppdaterer..."
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "Feil ved oppdatering av app"
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "Oppdatert"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "slettet"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "angre"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kunne ikke slette bruker"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig brukernavn"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av bruker"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Oppgi et gyldig passord"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -184,36 +181,36 @@ 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 ""
+msgstr "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Installasjonsadvarsel"
 
 #: 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 "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulen 'fileinfo' mangler"
 
 #: 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 modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Språk virker ikke"
 
 #: templates/admin.php:63
 #, php-format
@@ -221,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 "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Ingen internettilkopling"
 
 #: templates/admin.php:78
 msgid ""
@@ -235,104 +232,104 @@ 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 "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Utfør en oppgave med hver side som blir lastet"
 
 #: 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 er registrert som webcron-tjeneste. Kjør cron.php siden  i ownCloud rot hvert minutt vha http."
 
 #: 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 "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Deling"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver API for Deling"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillat apps å bruke API for Deling"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Tillat lenker"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillat brukere å dele filer med lenker"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "TIllat videredeling"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillat brukere å dele med alle"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Sikkerhet"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Tving HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Tvinger klienter til å bruke ownCloud via kryptert tilkopling."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL."
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Logg"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Loggnivå"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -340,7 +337,7 @@ 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 ""
+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
 msgid "Add your App"
@@ -360,7 +357,7 @@ msgstr "Se applikasjonens side på apps.owncloud.org"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
 
 #: templates/apps.php:38
 msgid "Update"
@@ -376,15 +373,15 @@ msgstr "Administratordokumentasjon"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "Online dokumentasjon"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Forum"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Feilsporing"
 
 #: templates/help.php:17
 msgid "Commercial Support"
@@ -401,9 +398,9 @@ msgstr "Få dine apps til å synkronisere dine filer"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Passord"
 
@@ -427,82 +424,74 @@ msgstr "Nytt passord"
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
-msgstr ""
-
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
+msgstr "Visningsnavn"
 
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "E-post"
+msgstr "Epost"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Oppi epostadressen du vil tilbakestille passordet for"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
-msgstr ""
+msgstr "Logginn navn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Opprett"
 
-#: templates/users.php:35
-msgid "Default Storage"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr "Standard lager"
+
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrenset"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
-msgstr ""
+msgstr "Lager"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
-msgstr ""
+msgstr "endre visningsnavn"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
-msgstr ""
+msgstr "sett nytt passord"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 4ae7f1b6dded7d845a95f404c8fa3a42dcef8687..7e92e2ca5b0dce0045a5fd901aae871013713843 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <hdalgrav@gmail.com>, 2012.
-# Ivar Bredesen <ivar.bredesen@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: MorphyNOR <ivar.bredesen@gmail.com>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +17,10 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Klarte ikke å slette tjener-konfigurasjonen."
@@ -55,281 +57,363 @@ msgstr "Behold innstillinger?"
 msgid "Cannot add server configuration"
 msgstr "Kan ikke legge til tjener-konfigurasjon"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Suksess"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Feil"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Tilkoblingstest lyktes"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Tilkoblingstest mislyktes"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Bekreft sletting"
 
-#: templates/settings.php:8
+#: 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 "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spør din system-administrator om å deaktivere en av dem."
 
-#: templates/settings.php:11
+#: 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 "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Tjener-konfigurasjon"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Legg til tjener-konfigurasjon"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Tjener"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "En hoved DN pr. linje"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Bruker DN"
 
-#: templates/settings.php:45
+#: 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 "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Passord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "For anonym tilgang, la DN- og passord-feltet stå tomt."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Brukerpålogging filter"
 
-#: templates/settings.php:53
+#: 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 "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Brukerliste filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppefilter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfigurasjon aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Sikkerhetskopierings (Replica) vert"
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Bruk TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case-insensitiv LDAP tjener (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Slå av SSL-sertifikat validering"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Ikke anbefalt, bruk kun for testing"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En endring tømmer bufferen."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Vis brukerens navnfelt"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP-attributen å bruke for å generere brukers ownCloud navn."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Hovedbruker tre"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "En Bruker Base DN pr. linje"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Vis gruppens navnfelt"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP-attributen å bruke for å generere gruppens ownCloud navn."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Hovedgruppe tre"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "En gruppe hoved-DN pr. linje"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "gruppe-medlem assosiasjon"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 915d27dae8f4790cb788b7d101362c8b7b429a8f..6228186b672966b6423f3287368469a2d72ca27c 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <espenbye@me.com>, 2012.
+# espenbye <espenbye@me.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 0ef3963546e9064e178ea3ef7658e6e8cd22029b..bbe6f7e5afc91cb8cf4985be4c2cfb033ccd9fee 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-03-22 00:03+0100\n"
-"PO-Revision-Date: 2013-03-21 23:03+0000\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -237,9 +241,11 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566
-#: js/share.js:578
+#: 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 ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:606
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -319,59 +325,59 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:276
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:311
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:314
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:317
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:323
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:357 js/share.js:553
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:578
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:593
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 927300ef72ba50e7b26dcafce26c621d9ec6dcfc..2a295626b154b5a7793414e54e742d87c166f067 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 89230b07489ac1e4600c91b4f2f2422ef9a89523..f9b5d81ccffa9f6f6a47cbb8eac8ee219efc76eb 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index 5920f250efe5c82805bd79c4313dafbe2cbd781f..7e7ed0e39682def72c0cb6a31892e7df3b057486 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/files_external.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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 0019778bcec42b6bf2c7391c3b4275287663e412..978e72b2ebf14de308dbe0fe1ad82c0f326ed38f 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,14 +35,14 @@ msgstr ""
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index e0c8624eb17ad4aa84002fdc29a173b1793341c9..0eebd5d130c7b412c27304bf69c6923767ed05e3 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
diff --git a/l10n/ne/files_versions.po b/l10n/ne/files_versions.po
index a2fa4e1dabc15ac3662a5b84b9ee53957b9a5fa0..75141cb34f99aeb0088a91ddf17f7aa676d4e518 100644
--- a/l10n/ne/files_versions.po
+++ b/l10n/ne/files_versions.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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index 59f4b9b2025f3e6cd95f94314e8c784621ed242f..17b8279af6310c6bc44301e26cadc423900502ac 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:282 setup.php:386 setup.php:395 setup.php:413 setup.php:423
-#: setup.php:432 setup.php:461 setup.php:527 setup.php:553 setup.php:560
-#: setup.php:571 setup.php:578 setup.php:587 setup.php:595 setup.php:604
-#: setup.php:610
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:283 setup.php:387 setup.php:396 setup.php:414 setup.php:424
-#: setup.php:433 setup.php:462 setup.php:528 setup.php:554 setup.php:561
-#: setup.php:572 setup.php:588 setup.php:596 setup.php:605
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:850
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 32d2e429fd31614ca21224cf4f9627e4aa067da8..e1e8ae4a62f49c9d14a157fbdcbf030aa0d7e396 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 57664ab3fc12ffa8efa1d0ef64d5f45834ac1965..eca44e17a0b15b2bfc50d5a33879e9bf9ed11c21 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/ne/user_webdavauth.po b/l10n/ne/user_webdavauth.po
index 7b62eb7fe6e2f7eff8d1201e1ad2a459194d8268..d8b30a63e3597b0dfd67a099f6918dd1055be87e 100644
--- a/l10n/ne/user_webdavauth.po
+++ b/l10n/ne/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-03-18 00:05+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 95513aea35080f1b5f62a3b11945f19c98bd82e3..b41b7619eec22263a9d5d548d78dbca1961d11e8 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -3,26 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-#   <bart.formosus@gmail.com>, 2011.
-#   <didi.debian@cknow.org>, 2012.
-# Erik Bent <hj.bent.60@gmail.com>, 2012.
-#   <icewind1991@gmail.com>, 2011.
-#   <jos@gelauff.net>, 2012.
-#   <koen@vervloesem.eu>, 2011.
-#   <lenny@weijl.org>, 2012.
-# Martin Wildeman <mhwildeman@gmail.com>, 2012.
-#   <pietje8501@gmail.com>, 2012.
-# Richard Bos <radoeka@gmail.com>, 2012.
-#   <transifex@thisnet.nl>, 2012.
-#   <translator@it-dept.eu>, 2012.
-#   <webbsite-mark@hotmail.com>, 2012.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -174,75 +161,79 @@ msgstr "december"
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuten geleden"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} uren geleden"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dagen geleden"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} maanden geleden"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "jaar geleden"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Kies"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "Annuleer"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nee"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nee"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -307,7 +298,7 @@ msgstr "Deel met link"
 msgid "Password protect"
 msgstr "Wachtwoord beveiliging"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -357,7 +348,7 @@ msgstr "toegangscontrole"
 
 #: js/share.js:325
 msgid "create"
-msgstr "maak"
+msgstr "creëer"
 
 #: js/share.js:328
 msgid "update"
@@ -410,24 +401,27 @@ msgstr "ownCloud wachtwoord herstellen"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-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."
+#: 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 "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."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Reset e-mail verstuurd."
+#: 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?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Verzoek mislukt!"
+#: 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."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Resetaanvraag"
 
@@ -441,7 +435,7 @@ msgstr "Naar de login-pagina"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Nieuw wachtwoord"
+msgstr "Nieuw"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -477,7 +471,7 @@ msgstr "Cloud niet gevonden"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Wijzigen categorieën"
+msgstr "Wijzig categorieën"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -533,37 +527,37 @@ msgstr "Geavanceerd"
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configureer de database"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "zal gebruikt worden"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Gebruiker database"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Wachtwoord database"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Naam database"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
@@ -571,37 +565,42 @@ msgstr "Installatie afronden"
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatische aanmelding geweigerd!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 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!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Uw wachtwoord vergeten?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "onthoud gegevens"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Meld je aan"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f5062d9d87cbfcac956721db984f9c37e6a6b03d..c7952ad45828dac17812fdb25972065938c66f0b 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -3,24 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-#   <bart.formosus@gmail.com>, 2011.
-#   <bartv@thisnet.nl>, 2011.
-#   <didi.debian@cknow.org>, 2012.
-# Erik Bent <hj.bent.60@gmail.com>, 2012.
-#   <icewind1991@gmail.com>, 2011.
-#   <jos@gelauff.net>, 2012.
-#   <koen@vervloesem.eu>, 2011.
-#   <lenny@weijl.org>, 2012.
-#   <pietje8501@gmail.com>, 2012.
-# Richard Bos <radoeka@gmail.com>, 2012.
-# Wilfred Dijksman <info@wdijksman.nl>, 2013.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 21:21+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,17 +28,13 @@ msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
 msgid "Could not move %s"
 msgstr "Kon %s niet verplaatsen"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kan bestand niet hernoemen"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Geen fout opgetreden, bestand successvol geupload."
+msgstr "De upload van het bestand is goedgegaan."
 
 #: ajax/upload.php:27
 msgid ""
@@ -60,19 +45,19 @@ msgstr "Het geüploade bestand overscheidt de upload_max_filesize optie in php.i
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Het geüploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
+msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Het bestand is slechts gedeeltelijk geupload"
+msgstr "Het bestand is gedeeltelijk geüpload"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Geen bestand geüpload"
+msgstr "Er is geen bestand geüpload"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Een tijdelijke map mist"
+msgstr "Er ontbreekt een tijdelijke map"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -90,55 +75,59 @@ msgstr "Ongeldige directory."
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Delen"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Wachten"
+msgstr "In behandeling"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "uitvoeren verwijderactie"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "bestanden aan het uploaden"
 
@@ -164,72 +153,80 @@ msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes"
+msgstr "Het lukt niet om uw bestand te uploaded, omdat het een folder of 0 bytes is"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Niet genoeg ruimte beschikbaar"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fout"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr "Bestandsgrootte"
+msgstr "Grootte"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Laatst aangepast"
+msgstr "Aangepast"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} bestanden"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Kan bestand niet hernoemen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Upload"
+msgstr "Uploaden"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -261,7 +258,7 @@ msgstr "Maximale grootte voor ZIP bestanden"
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "Opslaan"
+msgstr "Bewaren"
 
 #: templates/index.php:7
 msgid "New"
@@ -287,37 +284,37 @@ msgstr "Verwijderde bestanden"
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "U hebt hier geen schrijfpermissies."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Download"
+msgstr "Downloaden"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Stop delen"
+msgstr "Stop met delen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Bestanden te groot"
+msgstr "Upload is te groot"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Er wordt gescand"
 
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index c287efb9f79568a9589c75f6b7baad47f60a41f6..92b7cddfd69909a108cfb8153ac6f570bfcc8e7a 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013.
-# Lennart Weijl <lenny@weijl.org>, 2013.
-# Richard Bos <radoeka@gmail.com>, 2012.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-01 01:58+0200\n"
+"PO-Revision-Date: 2013-05-31 06: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +18,87 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Herstelsleutel succesvol geactiveerd"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Herstelsleutel succesvol gedeactiveerd"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Wachtwoord succesvol gewijzigd."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Opslaan"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Bestandsversleuteling geactiveerd."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Herstel account wachtwoord"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Geactiveerd"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Gedeactiveerd"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Wijzig versleuteling wachtwoord herstelsleutel"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Oude herstel account wachtwoord"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Nieuwe herstel account wachtwoord"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "De volgende bestandstypen zullen niet worden versleuteld:"
+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"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Sluit de volgende bestandstypen uit van versleuteling:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Bestandsherstel instellingen bijgewerkt"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Geen"
+#: templates/settings-personal.php:28
+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 9d227720c686f6143abc5bb172c1df24b47b246d..48cf0b02cc59634bce2795724a37b05a2b115c18 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-# Richard Bos <radoeka@gmail.com>, 2012.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,19 +38,26 @@ msgstr "Geef een geldige Dropbox key en secret."
 msgid "Error configuring Google Drive storage"
 msgstr "Fout tijdens het configureren van Google Drive opslag"
 
-#: lib/config.php:423
+#: 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 "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren."
 
-#: lib/config.php:426
+#: 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 "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren."
 
+#: 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 "<b>Waarschuwing:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van ownCloud / WebDAV of GoogleDrive is niet mogelijk. Vraag uw systeembeheerder dit te installeren."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externe opslag"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 4ac028d4f845a7bf38196e22d62e392198c91632..75f66ba8f5f5e214dd38890ad771b0e748bfba27 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <didi.debian@cknow.org>, 2012.
-# Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 14:47+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "Wachtwoord"
 msgid "Submit"
 msgstr "Verzenden"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s deelt de map %s met u"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s deelt het bestand %s met u"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Geen voorbeeldweergave beschikbaar voor"
 
-#: templates/public.php:37
+#: 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 bc4e1a37cd7866d69db4fdc71ee5b9c501ad922b..70d7161817a218c6217c5cea1c0f2e2aa0fe7908 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Kon %s niet permanent verwijderen"
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "uitvoeren restore operatie"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fout"
 
@@ -40,31 +39,31 @@ msgstr "Fout"
 msgid "delete file permanently"
 msgstr "verwijder bestanden definitief"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Naam"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} bestanden"
 
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 87ba278235f1297e5af989dbc1490cdda272ae34..83735c7ef761812a8f68dda5cf09728474286af0 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013.
-# Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 20:10+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\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"
 "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"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 5f9e61b57543cb99c23d9fb10bd230f1ddb561ba..772a6835765e228d3c327c4c07b61b1b0adca0cf 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013.
-#   <lenny@weijl.org>, 2012.
-# Richard Bos <radoeka@gmail.com>, 2012.
-#   <transifex@thisnet.nl>, 2012.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -21,47 +18,47 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Help"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Instellingen"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Beheerder"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "kon niet worden vastgesteld"
 
@@ -97,10 +94,6 @@ msgstr "Stel de gebruikersnaam van de beheerder in."
 msgid "Set an admin password."
 msgstr "Stel een beheerderswachtwoord in."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Geef een datamap op."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Er kon geen verbinding met Oracle worden bereikt"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fout: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Onjuiste commande was: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Verwijder deze gebruiker uit MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Verwijder deze gebruiker uit MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
@@ -243,19 +240,6 @@ msgstr "vorig jaar"
 msgid "years ago"
 msgstr "jaar geleden"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s is beschikbaar. Verkrijg <a href=\"%s\">meer informatie</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "bijgewerkt"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Meest recente versie controle is uitgeschakeld"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 3fc9792144bbd41c53e2bf28c0ab9065997a4217..47b47d57df3969fb3e2ae8b89c13eb898256a0bb 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -3,25 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-#   <bart.formosus@gmail.com>, 2011.
-#   <bramdv@me.com>, 2012.
-#   <didi.debian@cknow.org>, 2012.
-# Erik Bent <hj.bent.60@gmail.com>, 2012.
-#   <icewind1991@gmail.com>, 2011, 2012.
-#   <jos@gelauff.net>, 2012.
-#   <koen@vervloesem.eu>, 2011.
-#   <lenny@weijl.org>, 2012.
-#   <pietje8501@gmail.com>, 2012.
-# Richard Bos <radoeka@gmail.com>, 2012.
-# Wilfred Dijksman <translate@wdijksman.nl>, 2013.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -33,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kan de lijst niet van de App store laden"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Authenticatie fout"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Uw weergavenaam is gewijzigd."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Kon de weergavenaam niet wijzigen"
 
@@ -76,7 +69,7 @@ msgstr "Taal aangepast"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Ongeldig verzoek"
+msgstr "Ongeldige aanvraag"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -106,7 +99,7 @@ msgstr "Uitschakelen"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Inschakelen"
+msgstr "Activeer"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -128,52 +121,52 @@ msgstr "Fout bij bijwerken app"
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Aan het bewaren....."
+msgstr "Opslaan"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "verwijderd"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Groepen"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "verwijderen"
+msgstr "Verwijder"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "toevoegen groep"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Fout bij aanmaken gebruiker"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -203,7 +196,7 @@ msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omda
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
+msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -324,19 +317,19 @@ msgstr "Log"
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -407,7 +400,7 @@ msgstr "Download de apps om bestanden te synchen"
 msgid "Show First Run Wizard again"
 msgstr "Toon de Eerste start Wizard opnieuw"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -425,88 +418,80 @@ msgstr "Huidig wachtwoord"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "Nieuw wachtwoord"
+msgstr "Nieuw"
 
 #: templates/personal.php:44
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Weergavenaam"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Uw weergavenaam is gewijzigd"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Kon de weergavenaam niet wijzigen"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Wijzig weergavenaam"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Inlognaam"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Creëer"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Beheer herstel wachtwoord"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Default opslag"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "Andere"
+msgstr "Anders"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Opslag"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "wijzig weergavenaam"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "Instellen nieuw wachtwoord"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Default"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 22dfb2ddcc90324b57793020c9d170fb9b8c4af7..abd7ffccfebab34e7b806f23bcbdd9472b5f6983 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-#  <bart.formosus@gmail.com>, 2013.
-#   <lenny@weijl.org>, 2012.
+# André Koot <meneer@tken.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +18,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Niet gelukt de vertalingen leeg te maken."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Verwijderen serverconfiguratie mislukt"
@@ -56,281 +58,363 @@ msgstr "Instellingen bewaren?"
 msgid "Cannot add server configuration"
 msgstr "Kon de serverconfiguratie niet toevoegen"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "vertaaltabel leeggemaakt"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fout"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Verbindingstest geslaagd"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Verbindingstest mislukt"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Bevestig verwijderen"
 
-#: templates/settings.php:8
+#: 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 "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren."
 
-#: templates/settings.php:11
+#: 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 "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverconfiguratie"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Toevoegen serverconfiguratie"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Een Base DN per regel"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: 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 "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Gebruikers Login Filter"
 
-#: templates/settings.php:53
+#: 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 "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Gebruikers Lijst Filter"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Groep Filter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Verbindingsinstellingen"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuratie actief"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Poort"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Backup (Replica) Host"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Backup (Replica) Poort"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Deactiveren hoofdserver"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Gebruik TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache time-to-live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "in seconden. Een verandering maakt de cache leeg."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Mapinstellingen"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Een User Base DN per regel"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Attributen voor gebruikerszoekopdrachten"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optioneel; één attribuut per regel"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Een Group Base DN per regel"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Attributen voor groepszoekopdrachten"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Quota veld"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota standaard"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-mailveld"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Gebruikers Home map naamgevingsregel"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interne gebruikersnaam"
+
+#: 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 "Standaard wordt de interne gebruikersnaam aangemaakt op basis van de UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle * DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van voor ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op nieuw in kaart gebracht (toegevoegde) LDAP-gebruikers."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Interne gebruikersnaam attribuut:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Negeren UUID detectie"
+
+#: 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 "Standaard herkent ownCloud het UUID attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij dit hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw in kaart gebrachte (toegevoegde) LDAP-gebruikers en-groepen."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "UUID Attribuut:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
+
+#: 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 "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, zal elke LDAP-gebruiker ook een interne gebruikersnaam krijgen. Dit vereist een mapping van de ownCloud gebruikersnaam naar een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Ook de 'DN' wordt gecached om het aantal LDAP transacties te verminderen, maar deze wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden door ownCloud. De interne ownCloud naam wordt overal in ownCloud gebruikt. Wissen van de koppeling zal overal overblijfsel laten staan. Het wissen van Mappings is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze Mappings nooit in een productieomgeving plaatsvinden. Maak ze alleen leeg in een test-of ontwikkelomgeving."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Test configuratie"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 8606d6f3164523219f6ead10df2cff1de19e4bd4..9cd0fb7d2e0e6f82db8a2fab4eb350124131d61c 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2012-2013.
-# Richard Bos <radoeka@gmail.com>, 2012.
+# André Koot <meneer@tken.net>, 2012-2013
+# Richard Bos <radoeka@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 09:56+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "WebDAV authenticatie"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index c5361c17671279a98abe1bae7facb06d604d682e..c43a6c7137bd83ae8297f3a5694291c090a6b50f 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <erviker@gmail.com>, 2012.
-#   <p.ixiemotion@gmail.com>, 2011.
+# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,65 +22,65 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Brukaren %s delte ei fil med deg"
 
 #: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+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 ""
+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 ""
+msgstr "Brukaren %s delte mappa «%s» med deg. Du kan lasta ho ned her: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Ingen kategoritype."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr ""
+msgstr "Ingen kategori å leggja til?"
 
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Denne kategorien finst alt: %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 "Ingen objekttype."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "Ingen %s-ID."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Klarte ikkje leggja til %s i favorittar."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Ingen kategoriar valt for sletting."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Klarte ikkje fjerna %s frå favorittar."
 
 #: js/config.php:34
 msgid "Sunday"
@@ -162,82 +162,86 @@ msgstr "Desember"
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
-msgstr ""
+msgstr "sekund sidan"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutt sidan"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} minutt sidan"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 time sidan"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} timar sidan"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
-msgstr ""
+msgstr "i dag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
-msgstr ""
+msgstr "i går"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} dagar sidan"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
-msgstr ""
+msgstr "førre månad"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} månadar sidan"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
-msgstr ""
+msgstr "månadar sidan"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
-msgstr ""
+msgstr "i fjor"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
-msgstr ""
+msgstr "Ã¥r sidan"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
-msgstr ""
+msgstr "Vel"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Kanseller"
+msgstr "Avbryt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nei"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
-msgstr ""
+msgstr "Greitt"
 
 #: 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 "Objekttypen er ikkje spesifisert."
 
 #: 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
@@ -249,173 +253,176 @@ msgstr "Feil"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Programnamnet er ikkje spesifisert."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Den kravde fila {file} er ikkje installert!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Delt"
 
 #: js/share.js:90
 msgid "Share"
-msgstr ""
+msgstr "Del"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr ""
+msgstr "Feil ved deling"
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Feil ved udeling"
 
 #: js/share.js:143
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Feil ved endring av tillatingar"
 
 #: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Delt med deg og gruppa {group} av {owner}"
 
 #: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Delt med deg av {owner}"
 
 #: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "Del med"
 
 #: js/share.js:164
 msgid "Share with link"
-msgstr ""
+msgstr "Del med lenkje"
 
 #: js/share.js:167
 msgid "Password protect"
-msgstr ""
+msgstr "Passordvern"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Passord"
 
 #: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "Send lenkja over e-post"
 
 #: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Send"
 
 #: js/share.js:178
 msgid "Set expiration date"
-msgstr ""
+msgstr "Set utløpsdato"
 
 #: js/share.js:179
 msgid "Expiration date"
-msgstr ""
+msgstr "Utløpsdato"
 
 #: js/share.js:211
 msgid "Share via email:"
-msgstr ""
+msgstr "Del over e-post:"
 
 #: js/share.js:213
 msgid "No people found"
-msgstr ""
+msgstr "Fann ingen personar"
 
 #: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Vidaredeling er ikkje tillate"
 
 #: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Delt i {item} med {brukar}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr ""
+msgstr "Udel"
 
 #: js/share.js:320
 msgid "can edit"
-msgstr ""
+msgstr "kan endra"
 
 #: js/share.js:322
 msgid "access control"
-msgstr ""
+msgstr "tilgangskontroll"
 
 #: js/share.js:325
 msgid "create"
-msgstr ""
+msgstr "lag"
 
 #: js/share.js:328
 msgid "update"
-msgstr ""
+msgstr "oppdater"
 
 #: js/share.js:331
 msgid "delete"
-msgstr ""
+msgstr "slett"
 
 #: js/share.js:334
 msgid "share"
-msgstr ""
+msgstr "del"
 
 #: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr ""
+msgstr "Passordverna"
 
 #: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Klarte ikkje fjerna utløpsdato"
 
 #: js/share.js:589
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Klarte ikkje setja utløpsdato"
 
 #: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "Sender …"
 
 #: js/share.js:615
 msgid "Email sent"
-msgstr ""
+msgstr "E-post sendt"
 
 #: 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 "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr ""
+msgstr "Nullstilling av ownCloud-passord"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Bruk føljane link til å tilbakestille passordet ditt: {link}"
+msgstr "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du vil få ei lenkje for å nullstilla passordet via epost."
+#: 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 "Lenkja til å nullstilla passordet med er sendt til e-posten din.<br>Sjå i spam-/søppelmappa di viss du ikkje ser e-posten innan rimeleg tid.<br>Spør din lokale administrator viss han ikkje er der heller."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr ""
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/brukarnamn?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr ""
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Be om nullstilling"
 
@@ -425,7 +432,7 @@ msgstr "Passordet ditt er nullstilt"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Til innloggings sida"
+msgstr "Til innloggingssida"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -445,11 +452,11 @@ msgstr "Brukarar"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrer"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -457,7 +464,7 @@ msgstr "Hjelp"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "Tilgang forbudt"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -465,7 +472,7 @@ msgstr "Fann ikkje skyen"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr ""
+msgstr "Endra kategoriar"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -474,40 +481,40 @@ msgstr "Legg til"
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
-msgstr ""
+msgstr "Tryggleiksåtvaring"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Ver venleg og oppdater PHP-installasjonen din så han køyrer ownCloud på ein trygg måte."
 
 #: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Ingen tilgjengeleg tilfeldig nummer-generator, ver venleg og aktiver OpenSSL-utvidinga i PHP."
 
 #: 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 ""
+msgstr "Utan ein trygg tilfeldig nummer-generator er det enklare for ein åtakar å gjetta seg fram til passordnullstillingskodar og dimed ta over kontoen din."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer."
 
 #: 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 "Ver venleg og les <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentasjonen</a> for å læra korleis du set opp tenaren din på rett måte."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -521,77 +528,82 @@ msgstr "Avansert"
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr "Konfigurer databasen"
+msgstr "Set opp databasen"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "vil bli nytta"
+msgstr "vil verta nytta"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tabellnamnrom for database"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Vev tjenester under din kontroll"
+msgstr "Vevtenester under din kontroll"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Logg ut"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatisk innlogging avvist!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Viss du ikkje endra passordet ditt nyleg, så kan kontoen din vera kompromittert!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Ver venleg og endra passordet for å gjera kontoen din trygg igjen."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternative innloggingar"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -604,4 +616,4 @@ msgstr "neste"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index a5bb432c423dfd440bb9b7a5c57c9255c5b55196..3e649ef10d8511cf625609d5f344ca19934274bf 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <erviker@gmail.com>, 2012.
-#   <p.ixiemotion@gmail.com>, 2011.
+# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -22,20 +22,16 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
+msgstr "Klarte ikkje flytta %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ingen filer lasta opp. Ukjend feil"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -44,7 +40,7 @@ msgstr "Ingen feil, fila vart lasta opp"
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: "
 
 #: ajax/upload.php:29
 msgid ""
@@ -66,156 +62,168 @@ msgstr "Manglar ei mellombels mappe"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Klarte ikkje skriva til disk"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig mappe."
 
 #: appinfo/app.php:12
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Del"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Slett for godt"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Slett"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
-msgstr ""
+msgstr "Endra namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr ""
+msgstr "Under vegs"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} finst allereie"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr ""
+msgstr "byt ut"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr ""
+msgstr "føreslå namn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr ""
+msgstr "avbryt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
-msgstr ""
+msgstr "angre"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "utfør sletting"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr ""
+msgstr "1 fil lastar opp"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "filer lastar opp"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "«.» er eit ugyldig filnamn."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Filnamnet kan ikkje vera tomt."
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Opplasting avbroten."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "Nettadressa kan ikkje vera tom."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
-msgstr ""
+msgstr "1 mappe"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} mapper"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
-msgstr ""
+msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
-msgstr ""
+msgstr "{count} filer"
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Klarte ikkje endra filnamnet"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -223,7 +231,7 @@ msgstr "Last opp"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "Filhandtering"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -231,23 +239,23 @@ msgstr "Maksimal opplastingsstorleik"
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr ""
+msgstr "maks. moglege:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Nødvendig for fleirfils- og mappenedlastingar."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Slå på ZIP-nedlasting"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 er ubegrensa"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "Maksimal storleik for ZIP-filer"
 
 #: templates/admin.php:26
 msgid "Save"
@@ -267,50 +275,50 @@ msgstr "Mappe"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "Frå lenkje"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Sletta filer"
 
 #: templates/index.php:48
 msgid "Cancel upload"
-msgstr ""
+msgstr "Avbryt opplasting"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du har ikkje skriverettar her."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr ""
+msgstr "Udel"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr ""
+msgstr "Køyrande skanning"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Oppgraderer mellomlageret av filsystemet …"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 5b5ba56793880ef8d642b10754c107ab8356bd54..03d96695bf52138f8d26f51d8c217cb3a8e9b706 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Lagrar …"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 3ab783c8371ec70e21f69501ff246b2fbda9e04e..ff8d073d4d69cb863636f9d648612dd276896177 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
@@ -64,7 +71,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Configuration"
-msgstr ""
+msgstr "Innstillingar"
 
 #: templates/settings.php:12
 msgid "Options"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 6a569d362f5f6f606e3bc263ae88b012fa49537b..be0de366a60a80a3cbd04632e21c1b1e124de07b 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "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"
@@ -19,30 +20,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Send"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s delte mappa %s med deg"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s delte fila %s med deg"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Last ned"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
-msgstr ""
+msgstr "Inga førehandsvising tilgjengeleg for"
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "Vev tjenester under din kontroll"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index c000ec8f09114e65efb43de4096362c56efbfb76..96fe31c4038904e5aae5ed42f02e148ed4df05d1 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -20,60 +21,60 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Klarte ikkje sletta %s for godt"
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Klarte ikkje gjenoppretta %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
-msgstr ""
+msgstr "utfør gjenoppretting"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Feil"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "slett fila for godt"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "Slett for godt"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "Sletta"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
-msgstr ""
+msgstr "1 mappe"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} mapper"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
-msgstr ""
+msgstr "1 fil"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
-msgstr ""
+msgstr "{count} filer"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Ingenting her. Papirkorga di er tom!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "Gjenopprett"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -81,4 +82,4 @@ msgstr "Slett"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "Sletta filer"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index abcb5fe4f5fb054f02505d8ef9fdc0496c9442f9..4de20b084400d38ed5170b3112e6cb7ffda70f13 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +21,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Klarte ikkje å tilbakestilla: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "vellukka"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Tilbakestilte fila %s til utgåva %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "feil"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Klarte ikkje tilbakestilla fila %s til utgåva %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "Ingen eldre utgåver tilgjengelege"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "Ingen sti gjeve"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Utgåver"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Tilbakestill ei fil til ei tidlegare utgåve ved å klikka tilbakestill-knappen"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index a21cfaf86b21e5763f2416a33c32f98373f41794..c4da7d80ceaea11fcc155f65c9740c88a210be53 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +18,47 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personleg"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Brukarar"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "Program"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administrer"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +94,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,83 +114,87 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr ""
+msgstr "sekund sidan"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutt sidan"
 
 #: template.php:115
 #, php-format
@@ -202,7 +203,7 @@ msgstr ""
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 time sidan"
 
 #: template.php:117
 #, php-format
@@ -211,11 +212,11 @@ msgstr ""
 
 #: template.php:118
 msgid "today"
-msgstr ""
+msgstr "i dag"
 
 #: template.php:119
 msgid "yesterday"
-msgstr ""
+msgstr "i går"
 
 #: template.php:120
 #, php-format
@@ -224,7 +225,7 @@ msgstr ""
 
 #: template.php:121
 msgid "last month"
-msgstr ""
+msgstr "førre månad"
 
 #: template.php:122
 #, php-format
@@ -233,24 +234,11 @@ msgstr ""
 
 #: template.php:123
 msgid "last year"
-msgstr ""
+msgstr "i fjor"
 
 #: template.php:124
 msgid "years ago"
-msgstr ""
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
+msgstr "Ã¥r sidan"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f6264b6953eea442c8c983530435a9ca8c10a594..8fd884206149c6b12568ffa0d659f88be19ba4a3 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <erviker@gmail.com>, 2012.
-#   <p.ixiemotion@gmail.com>, 2011.
+# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,28 +21,32 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Klarer ikkje å laste inn liste fra App Store"
+msgstr "Klarer ikkje å lasta inn liste fra app-butikken"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Feil i autentisering"
+msgstr "Autentiseringsfeil"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Visingsnamnet ditt er endra."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "Klarte ikkje endra visingsnamnet"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "Gruppa finst allereie"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "Klarte ikkje leggja til gruppa"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr ""
+msgstr "Klarte ikkje slå på programmet."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -54,11 +58,11 @@ msgstr "Ugyldig e-postadresse"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Klarte ikkje å sletta gruppa"
 
 #: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Klarte ikkje sletta brukaren"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -70,25 +74,25 @@ msgstr "Ugyldig førespurnad"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Klarte ikkje leggja til brukaren til gruppa %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Klarte ikkje oppdatera programmet."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Oppdater til {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -100,7 +104,7 @@ msgstr "Slå på"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Ver venleg og vent …"
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -108,68 +112,68 @@ msgstr "Feil"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "Oppdaterer …"
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "Feil ved oppdatering av app"
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "Oppdatert"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr ""
+msgstr "Lagrar …"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "sletta"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
-msgstr ""
+msgstr "angra"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppestyrar"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "legg til gruppe"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Du må oppgje eit gyldig brukarnamn"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "Feil ved oppretting av brukar"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Du må oppgje eit gyldig passord"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Nynorsk"
 
 #: templates/admin.php:15
 msgid "Security Warning"
-msgstr ""
+msgstr "Tryggleiksåtvaring"
 
 #: templates/admin.php:18
 msgid ""
@@ -178,36 +182,36 @@ 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 ""
+msgstr "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rår sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frå dokumentrota til tenaren."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Oppsettsåtvaring"
 
 #: 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 "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Modulen «fileinfo» manglar"
 
 #: 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-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Regionaldata fungerer ikkje"
 
 #: templates/admin.php:63
 #, php-format
@@ -215,11 +219,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 "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Nettilkoplinga fungerer ikkje"
 
 #: templates/admin.php:78
 msgid ""
@@ -229,104 +233,104 @@ 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 "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Utfør éi oppgåve for kvar sidelasting"
 
 #: 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 er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http."
 
 #: 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 "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Deling"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Slå på API-et for deling"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "La app-ar bruka API-et til deling"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Tillat lenkjer"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "La brukarar dela ting offentleg med lenkjer"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Tillat vidaredeling"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "La brukarar vidaredela delte ting"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "La brukarar dela med kven som helst"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "La brukarar dela berre med brukarar i deira grupper"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Tryggleik"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Krev HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga."
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Logg"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Log nivå"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "Meir"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
-msgstr ""
+msgstr "Mindre"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
-msgstr ""
+msgstr "Utgåve"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,27 +338,27 @@ 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 ""
+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
 msgid "Add your App"
-msgstr ""
+msgstr "Legg til din app"
 
 #: templates/apps.php:12
 msgid "More Apps"
-msgstr ""
+msgstr "Fleire app-ar"
 
 #: templates/apps.php:28
 msgid "Select an App"
-msgstr "Vel ein applikasjon"
+msgstr "Vel eit program"
 
 #: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Sjå programsida på apps.owncloud.com"
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>"
 
 #: templates/apps.php:38
 msgid "Update"
@@ -362,52 +366,52 @@ msgstr "Oppdater"
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr ""
+msgstr "Brukardokumentasjon"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "Administratordokumentasjon"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "Dokumentasjon på nett"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Forum"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Feilsporar"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr ""
+msgstr "Betalt brukarstøtte"
 
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "FÃ¥ app-ar som kan synkronisera filene dine"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr ""
+msgstr "Vis Oppstartvegvisaren igjen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Passord"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
-msgstr ""
+msgstr "Passordet ditt er endra"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "Klarte ikkje å endra passordet"
+msgstr "Klarte ikkje endra passordet"
 
 #: templates/personal.php:40
 msgid "Current password"
@@ -421,82 +425,74 @@ msgstr "Nytt passord"
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
-msgstr ""
-
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
+msgstr "Visingsnamn"
 
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Epost"
+msgstr "E-post"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
-msgstr "Din epost addresse"
+msgstr "Di epost-adresse"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling"
+msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
-msgstr "Hjelp oss å oversett"
+msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
-msgstr ""
+msgstr "Innloggingsnamn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Lag"
 
-#: templates/users.php:35
-msgid "Default Storage"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr "Standardlagring"
+
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
-msgstr ""
+msgstr "Ubegrensa"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
-msgstr ""
+msgstr "Lagring"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
-msgstr ""
+msgstr "endra visingsnamn"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
-msgstr ""
+msgstr "lag nytt passord"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
-msgstr ""
+msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 33368c43791836fc463f16039f904bbc9615674d..1be6b4e2852697046ec4bd1b854db9ad274edda3 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -39,7 +43,7 @@ msgstr ""
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr ""
+msgstr "Feil ved sletting"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Feil"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 42c4c7ed9766f0a5759f6a912c130e0ec63e5b47..37bb2ea522ad719f5a8209963123e1ee6d42dece 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV-autentisering"
 
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+msgstr "Nettadresse: http://"
 
-#: templates/settings.php:6
+#: 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 ""
+msgstr "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/l10n/oc/core.po b/l10n/oc/core.po
index 900861203d0488a66003cd750bcec99577a3a37e..84c9bf9a5d4bb1da351e2319dd228ed3edbcd6ad 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <d.chateau@laposte.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -111,43 +110,43 @@ msgstr "Dissabte"
 
 #: js/config.php:45
 msgid "January"
-msgstr "Genièr"
+msgstr "genièr"
 
 #: js/config.php:46
 msgid "February"
-msgstr "Febrièr"
+msgstr "febrièr"
 
 #: js/config.php:47
 msgid "March"
-msgstr "Març"
+msgstr "març"
 
 #: js/config.php:48
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 
 #: js/config.php:49
 msgid "May"
-msgstr "Mai"
+msgstr "mai"
 
 #: js/config.php:50
 msgid "June"
-msgstr "Junh"
+msgstr "junh"
 
 #: js/config.php:51
 msgid "July"
-msgstr "Julhet"
+msgstr "julhet"
 
 #: js/config.php:52
 msgid "August"
-msgstr "Agost"
+msgstr "agost"
 
 #: js/config.php:53
 msgid "September"
-msgstr "Septembre"
+msgstr "septembre"
 
 #: js/config.php:54
 msgid "October"
-msgstr "Octobre"
+msgstr "octobre"
 
 #: js/config.php:55
 msgid "November"
@@ -161,75 +160,79 @@ msgstr "Decembre"
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "ans a"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Causís"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Anulla"
+msgstr "Annula"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Non"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ã’c"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Non"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "D'accòrdi"
 
@@ -294,7 +297,7 @@ msgstr "Parteja amb lo ligam"
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Senhal"
 
@@ -332,7 +335,7 @@ msgstr ""
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Non parteje"
+msgstr "Pas partejador"
 
 #: js/share.js:320
 msgid "can edit"
@@ -397,24 +400,27 @@ msgstr "senhal d'ownCloud tornat botar"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utiliza lo ligam seguent per tornar botar lo senhal : {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Nom d'usancièr"
+msgstr "Non d'usancièr"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Tornar botar requesit"
 
@@ -428,7 +434,7 @@ msgstr "Pagina cap al login"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Senhal nòu"
+msgstr "Senhal novèl"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -520,37 +526,37 @@ msgstr "Avançat"
 msgid "Data folder"
 msgstr "Dorsièr de donadas"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configura la basa de donadas"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "serà utilizat"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usancièr de la basa de donadas"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Senhal de la basa de donadas"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nom de la basa de donadas"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espandi de taula de basa de donadas"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Ã’ste de basa de donadas"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
@@ -558,37 +564,42 @@ msgstr "Configuracion acabada"
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Sortida"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "L'as perdut lo senhal ?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "bremba-te"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Dintrada"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index a18a3d2096bb5bffb9aa3c385b33050bbc141c6e..e01f381dc5ffccf817aa34d29b220c85afa9e27c 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <d.chateau@laposte.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -79,57 +74,61 @@ msgstr ""
 msgid "Files"
 msgstr "Fichièrs"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Parteja"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 fichièr al amontcargar"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "fichièrs al amontcargar"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Amontcarga"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Non parteja"
+msgstr "Pas partejador"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Exploracion en cors"
 
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 4db4079a8e0dcd4d6cc5bcfc7db55fd1c29bcf67..0277916620b5c4aeaf334a34d45e5f8d1c472aa8 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Enregistra..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index b363f8d316d4c9c180c7ecaed24c08c94dfef7c1..fddd4f32dda88eb9847852bd856b319cf1e64362 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 0e83b850761e01315554995c8e5a1159f6a5edda..01588c6a8757347fc439fc8475eec62f11086970 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Senhal"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Sosmetre"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Avalcarga"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "Services web jos ton contraròtle"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index 9e3213d785dc445cb21cf88be3f6b518e5e7662a..2794272c013c47ffbb428bc32fd5209849b56008 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Error"
 
@@ -39,31 +39,31 @@ msgstr "Error"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index a84be8cd14bb4d42b26e411ab1300d5e9125c13f..d1964f5cfaa8019f23fe402475e70067c8bbb1f1 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 151a4c2711edbc7203e67d01c5b83ec3f7d3acc7..42384905c8bc1b03c0a9b37eee4a8b9c83ba9899 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <d.chateau@laposte.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Configuracion"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usancièrs"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichièrs devan èsser avalcargats un per un."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Torna cap als fichièrs"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +239,6 @@ msgstr "an passat"
 msgid "years ago"
 msgstr "ans a"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr "a jorn"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "la verificacion de mesa a jorn es inactiva"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 699f5212820356da99a0489e95a2a6bd995e1174..027b3d41795376674d66dc2ca87cfd5b896dbc39 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <d.chateau@laposte.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Pas possible de cargar la tièra dempuèi App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Error d'autentificacion"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "escafat"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "defar"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grops"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grop Admin"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -232,11 +235,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 "Executa un prètfach amb cada pagina cargada"
 
 #: templates/admin.php:111
 msgid ""
@@ -248,15 +251,15 @@ msgstr ""
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Al partejar"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activa API partejada"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
@@ -307,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Jornal"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "Mai d'aquò"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Senhal"
 
@@ -420,82 +423,74 @@ msgstr "Senhal novèl"
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Corrièl"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Ton adreiça de corrièl"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Autres"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 3c1cdc754b3ef8856aa23fd0f259996db4500868..42404d1acfb6b9dc47b7af6d74a8af3e2d8466a2 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Error"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Senhal"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 03cdef79eb0ee5eae569799ab2b6b0f0dbdbe07a..13f4be6160241ece29d5e6e9d958ce22ad6753c1 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 3c34f8965fddd68c6a3c60bae872e81ae03f2a44..92aeb351a829e99ee727d285e656df70a796b503 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,26 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
-# Kamil Domański <kdomanski@kdemail.net>, 2011.
-#   <koalamis0@gmail.com>, 2012.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
-# Marcin Małecki <mosslar@gmail.com>, 2011.
-# Marco Oliver Grunwald <marco@mgrvnwald.com>, 2013.
-# Michał Plichta <mplichta@gmail.com>, 2013.
-#   <mosslar@gmail.com>, 2011.
-#   <mplichta@gmail.com>, 2012.
-# Piotr Sokół <psokol@jabster.pl>, 2012.
-#   <rightxhere1@gmail.com>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: emc <mplichta@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -173,75 +162,79 @@ msgstr "Grudzień"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minutÄ™ temu"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 godzinÄ™ temu"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} miesięcy temu"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "lat temu"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Wybierz"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nie"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nie"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -306,7 +299,7 @@ msgstr "Współdziel wraz z odnośnikiem"
 msgid "Password protect"
 msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Hasło"
 
@@ -409,24 +402,27 @@ msgstr "restart hasła ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Użyj tego odnośnika by zresetować hasło: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail."
+#: 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 "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Wysłano e-mail resetujący."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Żądanie nieudane!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Żądanie resetowania"
 
@@ -532,75 +528,80 @@ msgstr "Zaawansowane"
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Skonfiguruj bazÄ™ danych"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "zostanie użyte"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "usługi internetowe pod kontrolą"
+msgstr "Kontrolowane serwisy"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Wyloguj"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatyczne logowanie odrzucone!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Jeśli hasło było dawno niezmieniane, twoje konto może być zagrożone!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Zmień swoje hasło, aby ponownie zabezpieczyć swoje konto."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "pamiętaj"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Zaloguj"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index f0d3b79dee876cbc0faddce392839d42bea17197..ad1467f6580eeacb9b5a4aee98673a305ab96900 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,23 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-# Marcin Małecki <gerber@tkdami.net>, 2011-2012.
-# Mariusz <fisiu@opensuse.org>, 2013.
-#   <mosslar@gmail.com>, 2011.
-#   <mplichta@gmail.com>, 2012.
-# Piotr Sokół <psokol@jabster.pl>, 2012.
-#   <tomekde@gmail.com>, 2012.
+# adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 08:40+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,17 +28,13 @@ msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
 msgid "Could not move %s"
 msgstr "Nie można było przenieść %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nie można zmienić nazwy pliku"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Żaden plik nie został załadowany. Nieznany błąd"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Przesłano plik"
+msgstr "Nie było błędów, plik wysłano poprawnie."
 
 #: ajax/upload.php:27
 msgid ""
@@ -66,11 +53,11 @@ msgstr "Załadowany plik został wysłany tylko częściowo."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Nie przesłano żadnego pliku"
+msgstr "Nie wysłano żadnego pliku"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Brak katalogu tymczasowego"
+msgstr "Brak folderu tymczasowego"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -88,55 +75,59 @@ msgstr "Zła ścieżka."
 msgid "Files"
 msgstr "Pliki"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Udostępnij"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Usuń"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zastÄ…p"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piono {new_name} przez {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "wykonaj operację usunięcia"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 plik wczytywany"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "pliki wczytane"
 
@@ -162,72 +153,80 @@ msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchro
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nie można wczytać pliku, ponieważ jest on katalogiem lub ma 0 bajtów"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Za mało miejsca"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nie może być pusty."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "Ilość folderów: {count}"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "Ilość plików: {count}"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nieprawidłowa nazwa folderu. Wykorzystanie 'Shared' jest zarezerwowane przez ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nie można zmienić nazwy pliku"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Prześlij"
+msgstr "Wyślij"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -271,7 +270,7 @@ msgstr "Plik tekstowy"
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr "Katalog"
+msgstr "Folder"
 
 #: templates/index.php:14
 msgid "From link"
@@ -285,37 +284,37 @@ msgstr "Pliki usunięte"
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nie masz uprawnień do zapisu w tym miejscu."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Nie udostępniaj"
+msgstr "Zatrzymaj współdzielenie"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Wysyłany plik ma za duży rozmiar"
+msgstr "Ładowany plik jest za duży"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
 
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index ee5832f42daeb8eae9b872b8ce2c8df8eaea2416..5c3311df32ba7e3c5cc7f92b0a306ae1de99e9fb 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 09:46+0000\n"
-"Last-Translator: bbartlomiej <bbartlomiej@gmail.com>\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"
 "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"
@@ -19,22 +18,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "Zmiana hasła udana."
+
+#: ajax/changeRecoveryPassword.php:51
+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."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Zapisywanie..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Szyfrowanie plików jest włączone"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Odzyskiwanie hasła konta"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "WÅ‚Ä…czone"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr "Stare hasło odzyskiwania"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Nowe hasło odzyskiwania"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Poniższe typy plików nie będą szyfrowane:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Wyłącz poniższe typy plików z szyfrowania:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Ustawienia odzyskiwania plików zmienione"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Brak"
+#: templates/settings-personal.php:28
+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 700e621dc7d00471307fc81ed797ccdfabb59352..11491689a2ebaeb00446a506a112dc69c3b34daa 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-# Marcin Małecki <gerber@tkdami.net>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.pl>\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"
 "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"
@@ -41,19 +38,26 @@ msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
 msgid "Error configuring Google Drive storage"
 msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania."
 
-#: lib/config.php:426
+#: 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 "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go."
 
+#: 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 "<b>Ostrzeżenie:</b> Wsparcie dla  Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Zewnętrzna zasoby dyskowe"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index a355ae067e71ea5f8ad1c6cecbe446c35cbf3203..a72cd5421d03a768f1a00157ee951e696ef416c5 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <>, 2012.
-#   <mplichta@gmail.com>, 2012.
-# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-03 00:05+0100\n"
-"PO-Revision-Date: 2013-03-02 14:40+0000\n"
-"Last-Translator: emc <mplichta@gmail.com>\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"
 "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"
@@ -38,14 +35,14 @@ msgstr "%s współdzieli folder z tobą %s"
 msgid "%s shared the file %s with you"
 msgstr "%s współdzieli z tobą plik %s"
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Podgląd nie jest dostępny dla"
 
-#: templates/public.php:43
+#: 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 9d49e7ca92a80edda5cedd1758b2acc5566176fd..32ea27e1c974a66abfa833bd2c2ba34dc99015b0 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Nie można trwale usunąć %s"
 msgid "Couldn't restore %s"
 msgstr "Nie można przywrócić %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "wykonywanie operacji przywracania"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -40,33 +39,33 @@ msgstr "BÅ‚Ä…d"
 msgid "delete file permanently"
 msgstr "trwale usuń plik"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Usunięte"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
-msgstr "{count} foldery"
+msgstr "Ilość folderów: {count}"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
-msgstr "{count} pliki"
+msgstr "Ilość plików: {count}"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index 54824d793e71939227f1ccbb9b3ad25ba97dbc33..897cae06adf82179d4d7a705e7c7ab4175eeac3d 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <>, 2012.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-#   <mplichta@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-03 00:05+0100\n"
-"PO-Revision-Date: 2013-03-02 07:50+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.com>\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"
 "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"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 799e11c034335014f741107f5da2acaf4bafeac7..2a4ebb7fe45e934aee59881aaaffd9c89283452f 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-# Marcin Małecki <gerber@tkdami.net>, 2012-2013.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.pl>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -21,47 +18,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Osobiste"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyłączone."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Wróć do plików"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nie może zostać znaleziony"
 
@@ -97,10 +94,6 @@ msgstr "Ustaw nazwÄ™ administratora."
 msgid "Set an admin password."
 msgstr "Ustaw hasło administratora."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Określ folder danych."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,75 +114,79 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Nie można ustanowić połączenia z bazą Oracle"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "BÅ‚Ä…d DB: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Niepoprawna komenda: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Użytkownik MySQL  '%s'@'localhost' już istnieje"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Usuń tego użytkownika z MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Użytkownik MySQL  '%s'@'%%t' już istnieje"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Usuń tego użytkownika z MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "Serwer www nie jest jeszcze poprawnie ustawiony, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony. Sprawdź ustawienia serwera."
+msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Proszę sprawdź ponownie <a href='%s'>przewodnik instalacji</a>."
+msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
 
 #: template.php:113
 msgid "seconds ago"
@@ -206,7 +203,7 @@ msgstr "%d minut temu"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr "1 godzine temu"
+msgstr "1 godzinÄ™ temu"
 
 #: template.php:117
 #, php-format
@@ -215,7 +212,7 @@ msgstr "%d godzin temu"
 
 #: template.php:118
 msgid "today"
-msgstr "dzisiaj"
+msgstr "dziÅ›"
 
 #: template.php:119
 msgid "yesterday"
@@ -228,7 +225,7 @@ msgstr "%d dni temu"
 
 #: template.php:121
 msgid "last month"
-msgstr "ostatni miesiÄ…c"
+msgstr "w zeszłym miesiącu"
 
 #: template.php:122
 #, php-format
@@ -237,25 +234,12 @@ msgstr "%d miesiecy temu"
 
 #: template.php:123
 msgid "last year"
-msgstr "ostatni rok"
+msgstr "w zeszłym roku"
 
 #: template.php:124
 msgid "years ago"
 msgstr "lat temu"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s jest dostępna. Uzyskaj <a href=\"%s\">więcej informacji</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "Aktualne"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "wybór aktualizacji jest wyłączony"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index c177780e7e74d4667b53d4ad25baab06ca16bed0..0f7d1b635730d462011f4ecaaffb26b749d67a89 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,27 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <b13n1u@gmail.com>, 2013.
-# Bartek Krawczyk <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
-#   <icewind1991@gmail.com>, 2012.
-# Kamil Domański <kdomanski@kdemail.net>, 2011.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
-# Marcin Małecki <mosslar@gmail.com>, 2011.
-# Michał Plichta <mplichta@gmail.com>, 2013.
-#   <mosslar@gmail.com>, 2011.
-#   <mplichta@gmail.com>, 2012.
-# Piotr Sokół <psokol@jabster.pl>, 2012.
-#   <tomekde@gmail.com>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -35,12 +23,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nie można wczytać listy aplikacji"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "BÅ‚Ä…d uwierzytelniania"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Twoje wyświetlana nazwa została zmieniona."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Nie można zmienić wyświetlanej nazwy"
 
@@ -130,52 +122,52 @@ msgstr "BÅ‚Ä…d podczas aktualizacji aplikacji"
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "usunięto"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "cofnij"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nie można usunąć użytkownika"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupy"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Administrator grupy"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Usuń"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "dodaj grupÄ™"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Należy podać prawidłową nazwę użytkownika"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Błąd podczas tworzenia użytkownika"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Należy podać prawidłowe hasło"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "polski"
 
@@ -326,19 +318,19 @@ msgstr "Logi"
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -370,7 +362,7 @@ msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"autho
 
 #: templates/apps.php:38
 msgid "Update"
-msgstr "Zaktualizuj"
+msgstr "Aktualizuj"
 
 #: templates/help.php:4
 msgid "User Documentation"
@@ -409,7 +401,7 @@ msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
 msgid "Show First Run Wizard again"
 msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Hasło"
 
@@ -433,82 +425,74 @@ msgstr "Nowe hasło"
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Twoja nazwa wyświetlana została zmieniona"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Nie można zmienić twojej wyświetlanej nazwy"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Zmień wyświetlaną nazwę"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "E-mail"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Login"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Utwórz"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Odzyskiwanie hasła administratora"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Magazyn domyślny"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Bez limitu"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Magazyn"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "zmień wyświetlaną nazwę"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "ustaw nowe hasło"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index da513b5614f0dff78fc38568d3f49ef3f32b7e04..7b17734c312fff3f2b490313e01f844bbf9f490d 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <>, 2012.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013.
-# Maciej Tarmas <maciej@tarmas.com>, 2013.
-# Marcin Małecki <gerber@tkdami.net>, 2012.
-# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Maciej Tarmas <maciej@tarmas.pl>\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"
 "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"
@@ -22,6 +18,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Nie udało się wyczyścić mapowania."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Nie można usunąć konfiguracji serwera"
@@ -44,7 +44,7 @@ msgstr "Konfiguracja jest nieprawidłowa. Proszę przejrzeć logi dziennika ownC
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "Skasowanie nie powiodło się"
+msgstr "Usunięcie nie powiodło się"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -58,281 +58,363 @@ msgstr "Zachować ustawienia?"
 msgid "Cannot add server configuration"
 msgstr "Nie można dodać konfiguracji serwera"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "Mapoanie wyczyszczone"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sukces"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test połączenia udany"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Test połączenia nie udany"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potwierdź usunięcie"
 
-#: templates/settings.php:8
+#: 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 "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich."
 
-#: templates/settings.php:11
+#: 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 "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Konfiguracja servera"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Dodaj konfiguracjÄ™ servera"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Baza DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedna baza DN na liniÄ™"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Użytkownik DN"
 
-#: templates/settings.php:45
+#: 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 "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtr logowania użytkownika"
 
-#: templates/settings.php:53
+#: 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 "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lista filtrów użytkownika"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grupa filtrów"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Konfiguracja połączeń"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguracja archiwum"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Kopia zapasowa (repliki) host"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Kopia zapasowa (repliki) Port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Wyłącz serwer główny"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Po włączeniu, ownCloud tylko połączy się z serwerem repliki."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Wielkość liter serwera LDAP (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Niezalecane, użyj tylko testowo."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Przechowuj czas życia"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Ustawienia katalogów"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole wyświetlanej nazwy użytkownika"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Drzewo bazy użytkowników"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jeden użytkownik Bazy DN na linię"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Szukaj atrybutów"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcjonalnie; jeden atrybut w wierszu"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole wyświetlanej nazwy grupy"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna grupa bazy DN na liniÄ™"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Grupa atrybutów wyszukaj"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Członek grupy stowarzyszenia"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Specjalne atrybuty"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole przydziału"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Przydział domyślny"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Reguły nazewnictwa folderu domowego użytkownika"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Wewnętrzna nazwa użytkownika"
+
+#: 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 "Wewnętrzny atrybut nazwy uzżytkownika:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "ZastÄ…p wykrywanie UUID"
+
+#: 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 "Atrybuty UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Mapowanie użytkownika LDAP"
+
+#: 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 "Czyść Mapowanie użytkownika LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Czyść Mapowanie nazwy grupy LDAP"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Konfiguracja testowa"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 44e963a5a43418d911619eb251586c76198e1753..0f5ded49b5074e9efa2e80bceaed5869e748b6e9 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bbartlomiej@gmail.com>, 2013.
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
-# Marcin Małecki <gerber@tkdami.net>, 2012.
+# bbartlomiej <bbartlomiej@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012
+# 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-01-16 00:19+0100\n"
-"PO-Revision-Date: 2013-01-15 08:54+0000\n"
-"Last-Translator: bbartlomiej <bbartlomiej@gmail.com>\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"
 "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"
@@ -28,7 +28,7 @@ msgstr "Uwierzytelnienie WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index d0c11ccb995a9f57904e6b5b3d1cf613efd3e2c0..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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:00+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"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -237,8 +241,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 4c6737a9238debd7e999423338ea82d5daf3728d..be28fc5ba390cbb7d03f7ca685e93b2d963a6482 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
index d41a8cb3da55fdae02b4dba55be976f241454567..6b66a61ef662f2a864e9e033f42eab1ffde90277 100644
--- a/l10n/pl_PL/files_encryption.po
+++ b/l10n/pl_PL/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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: pl_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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index abd87d253b8b65416d0c841084e8a584975c02a2..be11b7a02683dc07094a5bda3aa751e50245d6ec 100644
--- a/l10n/pl_PL/files_external.po
+++ b/l10n/pl_PL/files_external.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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/pl_PL/files_sharing.po b/l10n/pl_PL/files_sharing.po
index 5735894fdf4391ef3d03b01b900b961ced937575..c8bd08a2eaecc5ea25b4b3d347537edc7623bd52 100644
--- a/l10n/pl_PL/files_sharing.po
+++ b/l10n/pl_PL/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/pl_PL/files_trashbin.po b/l10n/pl_PL/files_trashbin.po
index 03dea5e5995d6422b709f99e95dacc3886622389..e6ecf010e7703c93325b73d4ce984734b229898d 100644
--- a/l10n/pl_PL/files_trashbin.po
+++ b/l10n/pl_PL/files_trashbin.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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 8634a4a3e6a649fc4119ccdb39ad926584281e87..d6ce265c2afd3df538aeb548dff3b4ca1664fb47 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 4b31d0741574717702ceb6ebaccca193a963d6c0..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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: pl_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:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index b92c8f819aafbbcd5b8c37731ea98812dd321a67..68a0e23721f235484ac3f0955b0966748cb4febe 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\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"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 34b3f1b71578e51934807c738ba48da60dba6f69..242252ed0e4041d7d54ea8989405e862e084a96e 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: pl_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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 2ffe7523c4db1a9d706ea27a6e82aeac667ce821..2ac39a462117cdc174dc76900392873b9d04ba4b 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 1f2e7e074fb83d20e8d40e1b980d69e0b9a27aab..5f184727c3ec07725289ea7b343f258bfcc4f3b6 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -3,25 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dudanogueira@gmail.com>, 2012.
-#   <duda.nogueira@metasys.com.br>, 2011.
-#   <fred.maranhao@gmail.com>, 2012.
-#   <glauber.guimaraes@poli.ufrj.br>, 2012.
-# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
-#   <henrique@meira.net>, 2012.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-# Sedir G. Morais <philippi.sedir@gmail.com>, 2013.
-# Thiago Vicente <thiagovice@gmail.com>, 2012.
-# Unforgiving Fallout <>, 2012.
-# Van Der Fran <transifex@vanderland.com>, 2011, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 06:40+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,7 +74,7 @@ msgstr "Erro ao adicionar %s aos favoritos."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria selecionada para excluir."
+msgstr "Nenhuma categoria selecionada para remoção."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -170,77 +159,81 @@ msgstr "dezembro"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Configurações"
+msgstr "Ajustes"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minuto atrás"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 hora atrás"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrás"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} meses atrás"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Não"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Não"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -305,7 +298,7 @@ msgstr "Compartilhar com link"
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Senha"
 
@@ -408,24 +401,27 @@ msgstr "Redefinir senha ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use o seguinte link para redefinir sua senha: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Você receberá um link para redefinir sua senha por e-mail."
+#: 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 "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Email de redefinição de senha enviado."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "A requisição falhou!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Você receberá um link para redefinir sua senha por e-mail."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Nome de Usuário"
+msgstr "Nome de usuário"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Pedir redefinição"
 
@@ -455,7 +451,7 @@ msgstr "Usuários"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Apps"
+msgstr "Aplicações"
 
 #: strings.php:8
 msgid "Admin"
@@ -531,37 +527,37 @@ msgstr "Avançado"
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "será usado"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Usuário do banco de dados"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Espaço de tabela do banco de dados"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Host do banco de dados"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
@@ -569,37 +565,42 @@ msgstr "Concluir configuração"
 msgid "web services under your control"
 msgstr "serviços web sob seu controle"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Entrada Automática no Sistema Rejeitada!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Por favor troque sua senha para tornar sua conta segura novamente."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Esqueceu sua senha?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Fazer login"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 2ead61cd4c54bece7b64f6ff7e0e7c904fd04e0f..7a4deb445f2f2f91128fc04289d42d9207f0621b 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,25 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <dudanogueira@gmail.com>, 2013.
-#   <dudanogueira@gmail.com>, 2012.
-#   <fred.maranhao@gmail.com>, 2012.
-# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-# Sedir G. Morais <philippi.sedir@gmail.com>, 2013.
-#   <targinosilveira@gmail.com>, 2012.
-# Thiago Vicente <thiagovice@gmail.com>, 2012.
-# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 2013.
-# Unforgiving Fallout <>, 2012.
-# Van Der Fran <transifex@vanderland.com>, 2011, 2012.
+# 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 06:40+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\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"
 "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"
@@ -39,17 +28,13 @@ msgstr "Impossível mover %s - Um arquivo com este nome já existe"
 msgid "Could not move %s"
 msgstr "Impossível mover %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Impossível renomear arquivo"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
+msgstr "Sem erros, o arquivo foi enviado com sucesso"
 
 #: ajax/upload.php:27
 msgid ""
@@ -60,15 +45,15 @@ msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML"
+msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "O arquivo foi transferido parcialmente"
+msgstr "O arquivo foi parcialmente enviado"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Nenhum arquivo foi transferido"
+msgstr "Nenhum arquivo enviado"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -90,55 +75,59 @@ msgstr "Diretório inválido."
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Compartilhar"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "realizar operação de exclusão"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "enviando arquivos"
 
@@ -164,72 +153,80 @@ msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL não pode ficar em branco"
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} arquivos"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome de pasta inválido. O uso do nome 'Compartilhado' é reservado ao ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Impossível renomear arquivo"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Carregar"
+msgstr "Upload"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -261,7 +258,7 @@ msgstr "Tamanho máximo para arquivo ZIP"
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "Salvar"
+msgstr "Guardar"
 
 #: templates/index.php:7
 msgid "New"
@@ -287,37 +284,37 @@ msgstr "Arquivos apagados"
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Você não possui permissão de escrita aqui."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Arquivo muito grande"
+msgstr "Upload muito grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Scanning atual"
 
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 51cd8db4d819394f56204d0079add124d6f9e4a0..406cccd3c9dced72c4d957e7e606d97d0ec723ca 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 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-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 23:00+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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"
 "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"
@@ -19,22 +18,87 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Recuperação de chave habilitada com sucesso"
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Recuperação de chave desabilitada com sucesso"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!"
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr "Senha alterada com sucesso."
+
+#: ajax/changeRecoveryPassword.php:51
+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."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Salvando..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "A criptografia de arquivos está ativada."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Recuperar a senha da conta"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Habilidado"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr "Recuperação de senha de conta antiga"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Senha Nova  da conta de Recuperação"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Os seguintes tipos de arquivo não serão criptografados:"
+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"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir os seguintes tipos de arquivo da criptografia:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Configurações de recuperação de arquivo atualizado"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenhuma"
+#: templates/settings-personal.php:28
+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 e583eff474949af31988e1250c9ee0b2bd9c2dc6..5ec6ee8a8a54fb7179331394b48b7b1a3519e58e 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <dudanogueira@gmail.com>, 2013.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: dudanogueira <dudanogueira@gmail.com>\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"
 "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"
@@ -40,19 +38,26 @@ msgstr "Por favor forneça um app key e secret válido do Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar armazenamento do Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Aviso:</b> \"smbclient\" não está instalado. Impossível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo."
 
-#: lib/config.php:426
+#: 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 "<b>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. Impossível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo."
 
+#: 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 "<b> Aviso: </b> O suport a Curl em PHP não está habilitado ou instalado. A montagem do ownCloud / WebDAV ou GoogleDrive não é possível. Por favor, solicite ao seu administrador do sistema instalá-lo."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Armazenamento Externo"
@@ -100,7 +105,7 @@ msgstr "Usuários"
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "Remover"
+msgstr "Excluir"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index f6e8856cc62d04ad8c2af75f1d4a91efc9c63125..6fa030aecfdc3ffe43a8d5566adf4d97e585f12b 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <philippi.sedir@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-14 00:05+0100\n"
-"PO-Revision-Date: 2013-02-13 22:01+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Senha"
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s compartilhou a pasta %s com você"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s compartilhou o arquivo %s com você"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nenhuma visualização disponível para"
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr "web services sob seu controle"
+msgstr "serviços web sob seu controle"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index c4add70410cc413300326477853b10d6409e0310..a879b7924b423ee748c88c444ae90d860f4eee77 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Não foi possível excluir %s permanentemente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "realizar operação de restauração"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Erro"
 
@@ -40,31 +39,31 @@ msgstr "Erro"
 msgid "delete file permanently"
 msgstr "excluir arquivo permanentemente"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Excluído"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} arquivos"
 
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 88db88761f5a99a605c17f06139669fa61b5ce8f..8da66a76aac450bbdf6b5921e6127be4c4c99ba2 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <dudanogueira@gmail.com>, 2013.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-#   <tbsoares@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-07 12:10+0000\n"
-"Last-Translator: dudanogueira <dudanogueira@gmail.com>\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"
 "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"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 2bc542837e9d1fd8b82d41393e4ba0fc995d6459..a79218048710842bec853455e68a17fdbdfda37d 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dudanogueira@gmail.com>, 2012.
-# Frederico Freire Boaventura <fboaventura@live.com>, 2013.
-#   <glauber.guimaraes@poli.ufrj.br>, 2012.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: fboaventura <fboaventura@live.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,47 +18,47 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Usuários"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicações"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Download ZIP está desligado."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados são muito grandes para gerar arquivo zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "não pôde ser determinado"
 
@@ -98,10 +94,6 @@ msgstr "Defina um nome de usuário de administrador."
 msgid "Set an admin password."
 msgstr "Defina uma senha de administrador."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Especifique uma pasta de dados."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -122,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 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:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Conexão Oracle não pode ser estabelecida"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro no BD: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando ofensivo era: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuário MySQL '%s'@'localhost' já existe."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Derrubar este usuário do MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuário MySQL '%s'@'%%' já existe"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Derrube este usuário do MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
@@ -244,19 +240,6 @@ msgstr "último ano"
 msgid "years ago"
 msgstr "anos atrás"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s está disponível. Obtenha <a href=\"%s\">mais informações</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "atualizado"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "checagens de atualização estão desativadas"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 483d81c08ac37cf8187bb7340fbb36d481eb11e1..721a969b1c0ff248db34f2f2991f10d5f1c00e29 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <duda.nogueira@metasys.com.br>, 2011.
-# Frederico Freire Boaventura <fboaventura@live.com>, 2013.
-#   <fred.maranhao@gmail.com>, 2012.
-# Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-# Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
-#   <targinosilveira@gmail.com>, 2012.
-# Thiago Vicente <thiagovice@gmail.com>, 2012.
-#   <thoriumbr@gmail.com>, 2012.
-# Van Der Fran <transifex@vanderland.com>, 2011.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -32,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Não foi possível carregar lista da App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "A exibição de seu nome foi alterada."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Impossível alterar nome de exibição"
 
@@ -55,7 +49,7 @@ msgstr "Não foi possível habilitar aplicativo."
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr "E-mail guardado"
+msgstr "E-mail salvo"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
@@ -79,7 +73,7 @@ msgstr "Pedido inválido"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "Admins não podem se remover do grupo admin"
+msgstr "Admins não podem ser removidos do grupo admin"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -93,7 +87,7 @@ msgstr "Não foi possível remover usuário do grupo %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "Não foi possível atualizar o app."
+msgstr "Não foi possível atualizar a app."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -127,52 +121,52 @@ msgstr "Erro ao atualizar aplicativo"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Guardando..."
+msgstr "Salvando..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "excluído"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "desfazer"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Impossível remover usuário"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "adicionar grupo"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Forneça um nome de usuário válido"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Erro ao criar usuário"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Forneça uma senha válida"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
@@ -197,12 +191,12 @@ msgstr "Aviso de Configuração"
 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."
+msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando."
 
 #: templates/admin.php:33
 #, 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>."
+msgstr "Por favor, confira o <a href='%s'>guia de instalação</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -323,19 +317,19 @@ msgstr "Registro"
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -406,7 +400,7 @@ msgstr "Faça com que os apps sincronize seus arquivos"
 msgid "Show First Run Wizard again"
 msgstr "Mostrar este Assistente de novo"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Senha"
 
@@ -430,82 +424,74 @@ msgstr "Nova senha"
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nome de Exibição"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Seu nome de exibição foi alterado"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Impossível alterar seu nome de exibição"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Alterar nome de exibição"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nome de Login"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperação da Senha do Administrador"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Armazenamento Padrão"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "alterar nome de exibição"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "definir nova senha"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 8d7cd4367bf9e47b4462de8d86f8633b45b9b510..ae1906c7ede102097db88b9ef5168044888b7fd9 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <dudanogueira@gmail.com>, 2013.
-# Marcos Rodrigo Ladeia <marcosrodrigo.ladeia@gmail.com>, 2013.
-#   <philippi.sedir@gmail.com>, 2012.
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-# Tulio Simoes Martins Padilha <tuliouel@gmail.com>, 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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: dudanogueira <dudanogueira@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +18,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Falha ao limpar os mapeamentos."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Falha ao deletar a configuração do servidor"
@@ -58,281 +58,363 @@ msgstr "Manter ajustes?"
 msgid "Cannot add server configuration"
 msgstr "Impossível adicionar a configuração do servidor"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "mapeamentos limpos"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sucesso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Teste de conexão bem sucedida"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Teste de conexão falhou"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar Exclusão"
 
-#: templates/settings.php:8
+#: 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 "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você deverá experienciar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles."
 
-#: templates/settings.php:11
+#: 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 "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configuração de servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Adicionar Configuração de Servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Uma base DN por linha"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Usuário"
 
-#: templates/settings.php:45
+#: 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 "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Senha"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de Login de Usuário"
 
-#: templates/settings.php:53
+#: 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 "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtro de Lista de Usuário"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define filtro a ser aplicado ao obter usuários."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtro de Grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar ao obter grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Configurações de Conexão"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuração ativa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Quando não marcada, esta configuração será ignorada."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta do Backup (Réplica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desativar Servidor Principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Quando ativado, ownCloud somente se conectará ao servidor de réplica."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sensível à caixa alta (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar validação de certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, use somente para testes."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma mudança esvaziará o cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Configurações de Diretório"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Campo Nome de Exibição de Usuário"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Árvore de Usuário Base"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Um usuário-base DN por linha"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atributos de Busca de Usuário"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; um atributo por linha"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Campo Nome de Exibição de Grupo"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Árvore de Grupo Base"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Um grupo-base DN por linha"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de Busca de Grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associação Grupo-Membro"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos Especiais"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Campo de Cota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Cota Padrão"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de Email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra para Nome da Pasta Pessoal do Usuário"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Nome de usuário interno"
+
+#: 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 "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é única e personagens não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_ @ -.]. Outros caracteres são substituídas por seu correspondente ASCII ou simplesmente serão omitidos. Em colisões um número será adicionado/aumentado. O nome de utilizador interna é usada para identificar um utilizador internamente. É também o nome padrão para a pasta home do usuário em ownCloud. É também um porto de URLs remoto, por exemplo, para todos os serviços de *DAV. Com esta definição, o comportamento padrão pode ser anulado. Para conseguir um comportamento semelhante como antes ownCloud 5 entrar na tela atributo nome de usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários LDAP. "
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atributo Interno de Nome de Usuário:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Substituir detecção UUID"
+
+#: 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 "Por padrão, ownCloud detecta automaticamente o atributo UUID. O atributo UUID é usado para identificar, sem dúvida, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificada acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser obtida tanto para usuários e grupos e é único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas no recém mapeados (adicionado) de usuários e grupos LDAP."
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr "Atributo UUID:"
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr "Usuário-LDAP Mapeamento de Usuário"
+
+#: 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 "ownCloud usa nomes de usuários para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento de ownCloud do nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Além disso, o DN está em cache, assim como para reduzir a interação LDAP, mas que não é utilizado para a identificação. Se a DN muda, as mudanças serão encontradas pelo ownCloud. O nome ownCloud interno é utilizado em todo ownCloud. Limpando os mapeamentos terá sobras em todos os lugares. Limpeza dos mapeamentos não são sensíveis a configuração, isso afeta todas as configurações LDAP! Nunca limpar os mapeamentos em um ambiente de produção. Somente limpe os mapeamentos em uma fase de testes ou experimental."
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
+
+#: templates/settings.php:111
 msgid "Test Configuration"
 msgstr "Teste de Configuração"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index be539b59a8a815d456f36fb602f763aaa79d426e..ef503e227b11e50c88c353e6d9449f96f072da8f 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
-#   <thoriumbr@gmail.com>, 2012.
+# 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-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 16:22+0000\n"
-"Last-Translator: rodrigost23 <rodrigo.st23@hotmail.com>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "Autenticação WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 4c86c04f2a812d2799ad56b5bf42023714f62cd8..d21b78031856aa51383c3f3b39d0a1df3a12be7b 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,21 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012-2013.
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-#  <duartegrilo@gmail.com>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-#   <helder.meneses@gmail.com>, 2011, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
-# Nelson Rosado <nelsontrosado@gmail.com>, 2012.
-#   <rjgpp.1994@gmail.com>, 2012.
+# bmgmatias <bmgmatias@gmail.com>, 2013
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +75,7 @@ msgstr "Erro a adicionar %s aos favoritos"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria seleccionada para apagar"
+msgstr "Nenhuma categoria seleccionada para eliminar."
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -166,77 +160,81 @@ msgstr "Dezembro"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Definições"
+msgstr "Configurações"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "Há 1 minuto"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrás"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "Há 1 hora"
+msgstr "Há 1 horas"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Há {hours} horas atrás"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dias atrás"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Há {months} meses atrás"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "anos atrás"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Não"
+#: 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:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Não"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -301,9 +299,9 @@ msgstr "Partilhar com link"
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "Palavra chave"
+msgstr "Password"
 
 #: js/share.js:173
 msgid "Email link to person"
@@ -404,24 +402,27 @@ msgstr "Reposição da password ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use o seguinte endereço para repor a sua password: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vai receber um endereço para repor a sua password"
+#: 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 "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "E-mail de reinicialização enviado."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username correcto?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "O pedido falhou!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vai receber um endereço para repor a sua password"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Utilizador"
+msgstr "Nome de utilizador"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Pedir reposição"
 
@@ -435,7 +436,7 @@ msgstr "Para a página de entrada"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Nova password"
+msgstr "Nova palavra-chave"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -527,37 +528,37 @@ msgstr "Avançado"
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "vai ser usada"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tablespace da base de dados"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Anfitrião da base de dados"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
@@ -565,37 +566,42 @@ msgstr "Acabar instalação"
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Sair"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Login automático rejeitado!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Esqueceu-se da sua password?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 8a0017cf6d912f53437f32c4eb4e3ce90262f820..c0f7e43c7ebd622c7c429f91c3eb3ceae4fbcf4f 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012-2013.
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-#  <duartegrilo@gmail.com>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-#   <geral@ricardolameiro.pt>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
-# Miguel Sousa <migueljorgesousa@sapo.pt>, 2013.
-#   <rjgpp.1994@gmail.com>, 2012.
+# bmgmatias <bmgmatias@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -35,17 +28,13 @@ msgstr "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse
 msgid "Could not move %s"
 msgstr "Não foi possível move o ficheiro %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Não foi possível renomear o ficheiro"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Sem erro, ficheiro enviado com sucesso"
+msgstr "Não ocorreram erros, o ficheiro foi submetido com sucesso"
 
 #: ajax/upload.php:27
 msgid ""
@@ -56,19 +45,19 @@ msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upl
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulário HTML"
+msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "O ficheiro enviado só foi enviado parcialmente"
+msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Não foi enviado nenhum ficheiro"
+msgstr "Nenhum ficheiro foi submetido"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Falta uma pasta temporária"
+msgstr "Está a faltar a pasta temporária"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -86,57 +75,61 @@ msgstr "Directório Inválido"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Partilhar"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Eliminar"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugira um nome"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Executar a tarefa de apagar"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "A enviar os ficheiros"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -160,72 +153,80 @@ msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizad
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Espaço em disco insuficiente!"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "O URL não pode estar vazio."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Não foi possível renomear o ficheiro"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Enviar"
+msgstr "Carregar"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -241,7 +242,7 @@ msgstr "max. possivel: "
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Necessário para descarregamento múltiplo de ficheiros e pastas"
+msgstr "Necessário para multi download de ficheiros e pastas"
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -283,37 +284,37 @@ msgstr "Ficheiros eliminados"
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Não tem permissões de escrita aqui."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Envio muito grande"
+msgstr "Upload muito grande"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Os ficheiros que está a tentar enviar excedem o tamanho máximo de envio permitido neste servidor."
+msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Análise actual"
 
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 461a5030b77309c5bc3a67538e873b3340ffd754..0cba5c44e3850714fc6b20045b6d2a32c47ec97a 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
+# 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-02-11 00:03+0100\n"
-"PO-Revision-Date: 2013-02-10 14:21+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\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"
 "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,22 +18,87 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "Password alterada com sucesso."
+
+#: ajax/changeRecoveryPassword.php:51
+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."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "A guardar..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "A encriptação de ficheiros está ligada"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Activado"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Change Password"
+msgstr "Mudar a Password"
+
+#: templates/settings-personal.php:9
+msgid "Enable password recovery by sharing all files with your administrator:"
+msgstr ""
 
 #: templates/settings-personal.php:11
-msgid "The following file types will not be encrypted:"
-msgstr "Os seguintes ficheiros não serão encriptados:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Excluir da encriptação os seguintes tipos de ficheiro:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Nenhum"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index d0394c6efd7bb47cddada9a82186559baf688e31..92224eb30cbd31d70c0b807f19968fd6e7e0d5f8 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2013.
+# 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -40,19 +38,26 @@ msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar o armazenamento do Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
 
-#: lib/config.php:426
+#: 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 "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar."
 
+#: 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 "<b>Atenção:<br> O suporte PHP para o Curl não está activado ou instalado. A montagem do ownCloud/WebDav ou GoolgeDriver não é possível. Por favor contacte o administrador para o instalar."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Armazenamento Externo"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index b3df0a72fac2d849ea466878d81f9e1ace25363d..71503f3f05963467ea9ffafc2c41959d364883d6 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-01 02:04+0200\n"
-"PO-Revision-Date: 2012-09-30 22:25+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\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"
 "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"
@@ -20,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "Palavra-Passe"
+msgstr "Password"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s partilhou a pasta %s consigo"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s partilhou o ficheiro %s consigo"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr "Descarregar"
+msgstr "Transferir"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Não há pré-visualização para"
 
-#: templates/public.php:37
+#: 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 9ea47473c7c8ef7daefbbc49e6a0704b973252d8..bbc31c3a3fe5c2e3b3bb6b1958b6801d59bedb08 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daniel Pinto <daniel@mouxy.net>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Não foi possível eliminar %s de forma permanente"
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
-msgstr "Restaurar"
+msgstr "executar a operação de restauro"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Erro"
 
@@ -40,37 +39,37 @@ msgstr "Erro"
 msgid "delete file permanently"
 msgstr "Eliminar permanentemente o(s) ficheiro(s)"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nome"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Apagado"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr "Não ha ficheiros. O lixo está vazio"
+msgstr "Não hà ficheiros. O lixo está vazio!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
@@ -78,7 +77,7 @@ msgstr "Restaurar"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Eliminar"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 54018e45527e41bd0480898f883867d1cabf566b..07264486f6a61883791e758a7bd875c89dba70a1 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-# 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-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 11:40+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
 "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"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 83ab77f051f614fadd8dec7edd6a3b32ace987f2..b4cad793065f06735411c95e1169a34fa605e69b 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012-2013.
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -21,47 +18,47 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Configurações"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Utilizadores"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicações"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP está desligado."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados são grandes demais para gerar um ficheiro zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "Não foi possível determinar"
 
@@ -97,10 +94,6 @@ msgstr "Definir um nome de utilizador de administrador"
 msgid "Set an admin password."
 msgstr "Definiar uma password de administrador"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Especificar a pasta para os dados."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,83 +114,87 @@ 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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de utilizador/password do PostgreSQL inválido"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Nome de utilizador/password do Oracle inválida"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Não foi possível estabelecer a ligação Oracle"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de utilizador/password do MySQL inválida"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro na BD: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "O comando gerador de erro foi: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O utilizador '%s'@'%%' do MySQL já existe"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Nome de utilizador/password do Oracle inválida"
+
+#: setup.php:592 setup.php:624
 #, 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:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de utilizador/password do MySQL é inválido: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "há alguns segundos"
+msgstr "Minutos atrás"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "há 1 minuto"
+msgstr "Há 1 minuto"
 
 #: template.php:115
 #, php-format
@@ -228,7 +225,7 @@ msgstr "há %d dias"
 
 #: template.php:121
 msgid "last month"
-msgstr "mês passado"
+msgstr "ultímo mês"
 
 #: template.php:122
 #, php-format
@@ -241,20 +238,7 @@ msgstr "ano passado"
 
 #: template.php:124
 msgid "years ago"
-msgstr "há anos"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s está disponível. Obtenha <a href=\"%s\">mais informação</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "actualizado"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "a verificação de actualizações está desligada"
+msgstr "anos atrás"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index ce7f716bd8462a142463ec9a753fe4667d981734..14686edfb0d0fd1d46a2ddc17650c4702ea1f0ca 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -3,21 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012.
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-#  <duartegrilo@gmail.com>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012-2013.
-#   <geral@ricardolameiro.pt>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
-# Miguel Sousa <migueljorgesousa@sapo.pt>, 2013.
-#   <rjgpp.1994@gmail.com>, 2012.
+# bmgmatias <bmgmatias@gmail.com>, 2013
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -29,12 +23,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Incapaz de carregar a lista da App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Erro de autenticação"
+msgstr "Erro na autenticação"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "O seu nome foi alterado"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Não foi possível alterar o nome"
 
@@ -72,7 +70,7 @@ msgstr "Idioma alterado"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Pedido inválido"
+msgstr "Pedido Inválido"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -124,52 +122,52 @@ msgstr "Erro enquanto actualizava a aplicação"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "apagado"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "desfazer"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Não foi possível remover o utilizador"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Eliminar"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "Adicionar grupo"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Um nome de utilizador válido deve ser fornecido"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Erro a criar utilizador"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -320,19 +318,19 @@ msgstr "Registo"
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -403,9 +401,9 @@ msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
 msgid "Show First Run Wizard again"
 msgstr "Mostrar novamente Wizard de Arranque Inicial"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
-msgstr "Palavra-chave"
+msgstr "Password"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -427,82 +425,74 @@ msgstr "Nova palavra-chave"
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Nome público"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "O seu nome foi alterado"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Não foi possível alterar o seu nome"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Alterar nome"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "endereço de email"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Nome de utilizador"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Recuperar password de administrador"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Armazenamento Padrão"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "modificar nome exibido"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "definir nova palavra-passe"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 7a2318cd44f65e74a28d41f34a096f5494d27f1f..dbe72a43945e08bb1fe7ebce07529c384ab480de 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012-2013.
-# Daniel Pinto <daniel@mouxy.net>, 2013.
-# Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
-# Helder Meneses <helder.meneses@gmail.com>, 2012-2013.
-# Nelson Rosado <nelsontrosado@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\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"
 "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"
@@ -22,6 +17,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Erro ao eliminar as configurações do servidor"
@@ -58,281 +57,363 @@ msgstr "Manter as definições?"
 msgid "Cannot add server configuration"
 msgstr "Não foi possível adicionar as configurações do servidor."
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Sucesso"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Erro"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Teste de conecção passado com sucesso."
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Erro no teste de conecção."
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Deseja realmente apagar as configurações de servidor actuais?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Confirmar a operação de apagar"
 
-#: templates/settings.php:8
+#: 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 "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
 
-#: templates/settings.php:11
+#: 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 "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Configurações do servidor"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Adicionar configurações do servidor"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Anfitrião"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Uma base DN por linho"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN do utilizador"
 
-#: templates/settings.php:45
+#: 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 "O DN to cliente "
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr "Palavra-passe"
+msgstr "Password"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtro de login de utilizador"
 
-#: templates/settings.php:53
+#: 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 "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Utilizar filtro"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filtrar por grupo"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defina o filtro a aplicar, ao recuperar grupos."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Definições de ligação"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Configuração activa"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Se não estiver marcada, esta definição não será tida em conta."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Servidor de Backup (Réplica)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD "
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Porta do servidor de backup (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Desactivar servidor principal"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de réplicas."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Não utilize para adicionar ligações LDAP, irá falhar!"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validação de certificado SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, utilizado apenas para testes!"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache do tempo de vida dos objetos no servidor"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma alteração esvazia a cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Definições de directorias"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Base da árvore de utilizadores."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Uma base de utilizador DN por linha"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Utilizar atributos de pesquisa"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Opcional; Um atributo por linha"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Base da árvore de grupos."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Uma base de grupo DN por linha"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributos de pesquisa de grupo"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Quota"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Quota padrão"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Campo de email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Regra da pasta inicial do utilizador"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:99
+#: 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 "Testar a configuração"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index 6f6d78b3df7d945157b6ae3e881fe4e97cb614ec..e7e520a00afa40188b17c111471149e5300a9185 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012-2013.
-# Helder Meneses <helder.meneses@gmail.com>, 2012.
+# Mouxy <daniel@mouxy.net>, 2012-2013
+# Helder Meneses <helder.meneses@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-18 00:03+0100\n"
-"PO-Revision-Date: 2013-01-17 00:54+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "Autenticação WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index d6102ef27c1d0962fdd46fac8d2da4cfc24b7dde..1785acbaf04ddcbd7549f298207910b4850f6356 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
-# Dimon Pockemon <>, 2012.
-# Dumitru Ursu <>, 2013.
-# Eugen Mihalache <eugemjj@gmail.com>, 2012.
-#   <g.ciprian@osn.ro>, 2012.
-#   <laur.cristescu@gmail.com>, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +53,7 @@ msgstr "Nici o categorie de adăugat?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Această categorie deja există: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -164,77 +159,81 @@ msgstr "Decembrie"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Configurări"
+msgstr "Setări"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut în urmă"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minute in urma"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ore în urmă"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} zile in urma"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} luni în urmă"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "ani în urmă"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Alege"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Anulare"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nu"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nu"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -261,7 +260,7 @@ msgstr "Fișierul obligatoriu {file} nu este instalat!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Partajat"
 
 #: js/share.js:90
 msgid "Share"
@@ -299,9 +298,9 @@ msgstr "Partajare cu legătură"
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "Parola"
+msgstr "Parolă"
 
 #: js/share.js:173
 msgid "Email link to person"
@@ -388,11 +387,11 @@ 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 "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Te rugam sa raportezi problema aici.</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Modernizare reusita! Vei fii redirectionat!"
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
@@ -402,24 +401,27 @@ msgstr "Resetarea parolei ownCloud "
 msgid "Use the following link to reset your password: {link}"
 msgstr "Folosește următorul link pentru a reseta parola: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vei primi un mesaj prin care vei putea reseta parola via email"
+#: 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 "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Resetarea emailu-lui trimisa."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Solicitarea nu a reusit"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vei primi un mesaj prin care vei putea reseta parola via email"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Utilizator"
+msgstr "Nume utilizator"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Cerere trimisă"
 
@@ -453,7 +455,7 @@ msgstr "Aplicații"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrator"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -469,7 +471,7 @@ msgstr "Nu s-a găsit"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Editează categoriile"
+msgstr "Editează categorii"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -482,11 +484,11 @@ msgstr "Avertisment de securitate"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Versiunea dvs. PHP este vulnerabil la acest atac un octet null  (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Vă rugăm să actualizați instalarea dvs. PHP pentru a utiliza ownCloud in siguranță."
 
 #: templates/installation.php:32
 msgid ""
@@ -504,14 +506,14 @@ msgstr "Fara generatorul pentru numere de securitate , un atacator poate afla pa
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Directorul de date și fișiere sunt, probabil, accesibile de pe Internet, deoarece .htaccess nu funcționează."
 
 #: 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 "Pentru informatii despre configurarea corecta a serverului accesati pagina <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">Documentare</a>."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -525,37 +527,37 @@ msgstr "Avansat"
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "vor fi folosite"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tabela de spațiu a bazei de date"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Bază date"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
@@ -563,39 +565,44 @@ msgstr "Finalizează instalarea"
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Ieșire"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Logare automata respinsa"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Te rog schimba parola pentru ca, contul tau sa fie securizat din nou."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "amintește"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Autentificare"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Conectări alternative"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 329d55aeb0576f5f5b74029494b967ed3876ba0b..37d437a7e95ea388d48f662030a20fd38cf18a4e 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011-2013.
-# Dimon Pockemon <>, 2012.
-# Dumitru Ursu <>, 2013.
-# Eugen Mihalache <eugemjj@gmail.com>, 2012.
-#   <g.ciprian@osn.ro>, 2012-2013.
-#   <laur.cristescu@gmail.com>, 2012.
+# 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -33,17 +28,13 @@ msgstr "Nu se poate de mutat %s - Fișier cu acest nume deja există"
 msgid "Could not move %s"
 msgstr "Nu s-a putut muta %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nu s-a putut redenumi fișierul"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Nicio eroare, fișierul a fost încărcat cu succes"
+msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
 
 #: ajax/upload.php:27
 msgid ""
@@ -62,11 +53,11 @@ msgstr "Fișierul a fost încărcat doar parțial"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Niciun fișier încărcat"
+msgstr "Nu a fost încărcat nici un fișier"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Lipsește un dosar temporar"
+msgstr "Lipsește un director temporar"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -74,7 +65,7 @@ msgstr "Eroare la scriere pe disc"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Nu este suficient spațiu disponibil"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -84,57 +75,61 @@ msgstr "Director invalid."
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Partajează"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Stergere permanenta"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "efectueaza operatiunea de stergere"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "un fișier se încarcă"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "fișiere se încarcă"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -152,78 +147,86 @@ msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt pe
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Spatiul de stocare este plin, nu mai puteti incarca s-au sincroniza alte fisiere."
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Spatiul de stocare este aproape plin ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nu este suficient spațiu disponibil"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goală."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Eroare"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} fisiere"
 
+#: 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 "Nu s-a putut redenumi fișierul"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "Încarcă"
+msgstr "Încărcare"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -255,7 +258,7 @@ msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "Salvare"
+msgstr "Salvează"
 
 #: templates/index.php:7
 msgid "New"
@@ -275,46 +278,46 @@ msgstr "de la adresa"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Sterge fisierele"
 
 #: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Nu ai permisiunea de a sterge fisiere aici."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Anulează partajarea"
+msgstr "Anulare partajare"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteptă."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Modernizare fisiere de sistem cache.."
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index ba27a3e08d25f072b9ef8aba92d8a9f494e06b85..b3f31e838719ca40d3d936034e74732a2551957b 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dumitru Ursu <>, 2013.
-#   <g.ciprian@osn.ro>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Se salvează..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "ÃŽncriptare"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Niciuna"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 3a46aaedfb9aeb12befa0c04c2d34b5044095bac..fec3d4c6acbfd51bddec35236ab2699ec6578974 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dumitru Ursu <>, 2013.
-#   <g.ciprian@osn.ro>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -39,19 +37,26 @@ msgstr "Prezintă te rog o cheie de Dropbox validă și parola"
 msgid "Error configuring Google Drive storage"
 msgstr "Eroare la configurarea mediului de stocare Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze."
 
-#: lib/config.php:426
+#: 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 "<b>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze."
 
+#: 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 "<b>Atentie:</b> Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!"
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Stocare externă"
@@ -62,7 +67,7 @@ msgstr "Denumire director"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Stocare externă"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -78,7 +83,7 @@ msgstr "Aplicabil"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Adauga stocare"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 7966d650dad54ec58f4e1ebc2e05bc9906677ebb..da3c59ddf7ad1e5bb4ac60c7a78cae099dd38013 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <g.ciprian@osn.ro>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 13:27+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Parolă"
 msgid "Submit"
 msgstr "Trimite"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s a partajat directorul %s cu tine"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s a partajat fișierul %s cu tine"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nici o previzualizare disponibilă pentru "
 
-#: templates/public.php:37
+#: 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 35bf6a8679eb05e64a42c710b98ad9b871ff41d4..524c8b2c1ce8c08dafb13271a3fa9b998aa5ae1f 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Eroare"
 
@@ -39,31 +39,31 @@ msgstr "Eroare"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "Stergere permanenta"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Nume"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} fisiere"
 
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index 9a6c076a43c2a0fd01a130172ac28119dac0ccec..07ce3897b263a053f35bb3c8958cb722b3f147a3 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <g.ciprian@osn.ro>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,38 +20,38 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Nu a putut reveni: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "success"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "Fisierul %s a revenit la versiunea %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "eșec"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "Fisierele %s nu au putut reveni la versiunea %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "Versiunile vechi nu sunt disponibile"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "Nici un dosar specificat"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versiuni"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "Readuceti un fișier la o versiune anterioară, făcând clic pe butonul revenire"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 8d99123b223f6366637fdf38ce31fb30b5c49d9d..80808f2bdf187c0c3c26f4dcbcf3bcc1ca066b1d 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dumitru Ursu <>, 2013.
-#   <g.ciprian@osn.ro>, 2012.
-#   <laur.cristescu@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Ajutor"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Setări"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Utilizatori"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplicații"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Descărcarea ZIP este dezactivată."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Fișierele trebuie descărcate unul câte unul."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Înapoi la fișiere"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Fișierele selectate sunt prea mari pentru a genera un fișier zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nu poate fi determinat"
 
@@ -96,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -242,19 +239,6 @@ msgstr "ultimul an"
 msgid "years ago"
 msgstr "ani în urmă"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "la zi"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "verificarea după actualizări este dezactivată"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 3db3f86bebae77e1812ec48cca20b5f2f686a0f6..3bcdb939b06ac4bed277b96b12e54edddc74c579 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -3,19 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
-# Dimon Pockemon <>, 2012.
-# Dumitru Ursu <>, 2013.
-# Eugen Mihalache <eugemjj@gmail.com>, 2012.
-#   <g.ciprian@osn.ro>, 2012-2013.
-#   <icewind1991@gmail.com>, 2012.
-#   <iuranemo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -28,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposibil de încărcat lista din App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Eroare de autentificare"
+msgstr "Eroare la autentificare"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -101,7 +98,7 @@ msgstr "Dezactivați"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Activați"
+msgstr "Activare"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -123,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Salvez..."
+msgstr "Se salvează..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "șters"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupuri"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -238,59 +235,59 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Execută o sarcină la fiecare pagină încărcată"
 
 #: 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 este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http."
 
 #: 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 "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Partajare"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activare API partajare"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permite aplicațiilor să folosească API-ul de partajare"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Pemite legături"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Permite repartajarea"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Permite utilizatorilor să partajeze cu oricine"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -313,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Jurnal de activitate"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Nivel jurnal"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,13 +393,13 @@ msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Parolă"
 
@@ -426,82 +423,74 @@ msgstr "Noua parolă"
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Crează"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Stocare implicită"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Nelimitată"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Stocare"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 57370aee7d83dd2fb03a5f76c7281a260836b3c0..c5709c9e502404bfbbdaf884e7189b7984b88219 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dumitru Ursu <>, 2012-2013.
-#   <iuranemo@gmail.com>, 2012.
-#   <laur.cristescu@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -56,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Succes"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Eroare"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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 "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele."
 
-#: templates/settings.php:11
+#: 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 "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gazdă"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN de bază"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Un Base DN pe linie"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN al utilizatorului"
 
-#: templates/settings.php:45
+#: 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 "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filtrare după Nume Utilizator"
 
-#: templates/settings.php:53
+#: 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 "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filtrarea după lista utilizatorilor"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "fără substituenți, d.e. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Fitrare Grup"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definește filtrele care se aplică, când se preiau grupurile."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Portul"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Utilizează TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP insensibil la majuscule (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Oprește validarea certificatelor SSL "
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nu este recomandat, a se utiliza doar pentru testare."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Câmpul cu numele vizibil al utilizatorului"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Arborele de bază al Utilizatorilor"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Un User Base DN pe linie"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Câmpul cu numele grupului"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Arborele de bază al Grupurilor"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Un Group Base DN pe linie"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 1f11c76068bbe3713e58adf9250894ae60087fb1..7c28a3a2af761105d850b06e4205398b71875ad9 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dumitru Ursu <>, 2013.
-#   <laur.cristescu@gmail.com>, 2012.
+# Dimon Pockemon <>, 2013
+# laurentiucristescu <laur.cristescu@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-27 00:04+0100\n"
-"PO-Revision-Date: 2013-01-26 00:09+0000\n"
-"Last-Translator: Dimon Pockemon <>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "Autentificare WebDAV"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index c62ba9f9fc2c6135a55d6cefeb8df63b8f98178d..f62009a69c25664a9de7a5c2b3ec0da5f13e8110 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,24 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <jekader@gmail.com>, 2011, 2012.
-#   <k0ldbl00d@gmail.com>, 2012.
-# Mihail Vasiliev <mickvav@gmail.com>, 2012.
-#   <semen@sam002.net>, 2012.
-# Sergey <sergey@markevich.ru>, 2013.
-#   <sharov3@gmail.com>, 2013.
-#   <skoptev@ukr.net>, 2012.
-#   <tony.mccourin@gmail.com>, 2011.
-# Victor Bravo <>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
+# foool <andrglad@mail.ru>, 2013
+# Vyacheslav Muranov <s@neola.ru>, 2013
+# Langaru <langaru@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: Langaru <langaru@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -170,77 +161,81 @@ msgstr "Декабрь"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Настройки"
+msgstr "Конфигурация"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} минут назад"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "час назад"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} часов назад"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} дней назад"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} месяцев назад"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "несколько лет назад"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Выбрать"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
-msgstr "Отмена"
+msgstr "Отменить"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Нет"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr "Ошибка при загрузке файла выбора  шаблона"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Нет"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ок"
 
@@ -305,7 +300,7 @@ msgstr "Поделиться с ссылкой"
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Пароль"
 
@@ -408,24 +403,27 @@ msgstr "Сброс пароля "
 msgid "Use the following link to reset your password: {link}"
 msgstr "Используйте следующую ссылку чтобы сбросить пароль: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "На ваш адрес Email выслана ссылка для сброса пароля."
+#: 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 "Ссылка для сброса пароля была отправлена ​​по электронной почте. <br> Если вы не получите его в пределах одной двух минут, проверьте папку спам. <br> Если это не возможно, обратитесь к Вашему администратору."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Отправка письма с информацией для сброса."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Запрос не удался!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "На ваш адрес Email выслана ссылка для сброса пароля."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Запросить сброс"
 
@@ -459,7 +457,7 @@ msgstr "Приложения"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Администратор"
+msgstr "Admin"
 
 #: strings.php:9
 msgid "Help"
@@ -475,7 +473,7 @@ msgstr "Облако не найдено"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Редактировать категории"
+msgstr "Редактировать категрии"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -531,75 +529,80 @@ msgstr "Дополнительно"
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Настройка базы данных"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Имя пользователя для базы данных"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Пароль для базы данных"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Табличое пространство базы данных"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Завершить установку"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "Сетевые службы под твоим контролем"
+msgstr "веб-сервисы под вашим управлением"
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Выйти"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Автоматический вход в систему отключен!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Войти"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Альтернативные имена пользователя"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 1f81049a589304472b1e2306c41cd1de03cd5679..3c8d873ceb7a1f12bcbd730ffd496225c4c1ddbf 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,26 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <jekader@gmail.com>, 2012.
-#   <lankme@gmail.com>, 2012.
-#   <mpolr21@gmail.com>, 2012.
-# Nick Remeslennikov <homolibere@gmail.com>, 2012.
-#   <semen@sam002.net>, 2012.
-# Sergey <sergey@markevich.ru>, 2013.
-#   <sharov3@gmail.com>, 2013.
-#   <skoptev@ukr.net>, 2012.
-#   <tony.mccourin@gmail.com>, 2011.
-# Victor Ashirov <victor.ashirov@gmail.com>, 2013.
-# Victor Bravo <>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +27,13 @@ msgstr "Невозможно переместить %s - файл с таким
 msgid "Could not move %s"
 msgstr "Невозможно переместить %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "Файл успешно загружен"
+msgstr "Файл загружен успешно."
 
 #: ajax/upload.php:27
 msgid ""
@@ -62,11 +44,11 @@ msgstr "Файл превышает размер установленный uplo
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме"
+msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Файл был загружен не полностью"
+msgstr "Файл загружен частично"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -74,7 +56,7 @@ msgstr "Файл не был загружен"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Невозможно найти временную папку"
+msgstr "Отсутствует временная папка"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -92,57 +74,61 @@ msgstr "Неправильный каталог."
 msgid "Files"
 msgstr "Файлы"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Открыть доступ"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Удалено навсегда"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "выполняется операция удаления"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "файлы загружаются"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -166,72 +152,80 @@ msgstr "Ваше дисковое пространство полностью з
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Не удается загрузить файл размером 0 байт в каталог"
+msgstr "Файл не был загружен: его размер 0 байт либо это не файл, а директория."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Недостаточно свободного места"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Ссылка не может быть пустой."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Название"
+msgstr "Имя"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} файлов"
 
+#: 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 "Загрузить"
+msgstr "Загрузка"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -289,37 +283,37 @@ msgstr "Удалённые файлы"
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "У вас нет разрешений на запись здесь."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Отменить публикацию"
+msgstr "Закрыть общий доступ"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Файл слишком большой"
+msgstr "Файл слишком велик"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Текущее сканирование"
 
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 1244183e43b039381c2fe04567c059ff71a75866..3cb93ae3108861c9965c2b04ddd2cb5c9a39eed5 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
+# Ант По <du6egub@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +18,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "Невозможно изменить пароль. Возможно старый пароль не был верен."
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Сохранение..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Шифрование файла включено."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)"
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr "Восстановление пароля учетной записи"
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Включено"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "Отключено"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "Изменить шифрование пароля ключа восстановления:"
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr "Старое Восстановление пароля учетной записи"
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr "Новое Восстановление пароля учетной записи"
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Следующие типы файлов не будут зашифрованы:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Исключить следующие типы файлов из шифрованных:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Настройки файла восстановления обновлены"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ничего"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "Невозможно обновить файл восстановления"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 26f68be9545e9f06983227c04640ecc6a9c2a355..bd2a52616df9415894add07a41886b2de238e26d 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <semen@sam002.net>, 2012.
-#   <skoptev@ukr.net>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\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"
 "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"
@@ -41,19 +37,26 @@ msgstr "Пожалуйста, предоставьте действующий к
 msgid "Error configuring Google Drive storage"
 msgstr "Ошибка при настройке хранилища Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
 
-#: lib/config.php:426
+#: 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 "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить."
 
+#: 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 "<b>Внимание:</b> Поддержка Curl в PHP не включена или не установлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. Попросите вашего системного администратора установить его."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Внешний носитель"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 425b0ed259102204fd6dfc30fce3d633de62c059..26b75dfce7c6a626a8a6720c47cc12d56bb5210d 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <iuranemo@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 13:24+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\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"
 "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"
@@ -29,24 +25,24 @@ msgstr "Пароль"
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s открыл доступ к папке %s для Вас"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s открыл доступ к файлу %s для Вас"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Предпросмотр недоступен для"
 
-#: templates/public.php:35
+#: 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 7ab8779e1f214cd89ba7fecf6d6975d78a591f2d..783b6edd7dca982873913dacea98353655820f9a 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "%s не может быть удалён навсегда"
 msgid "Couldn't restore %s"
 msgstr "%s не может быть восстановлен"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "выполнить операцию восстановления"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Ошибка"
 
@@ -40,31 +39,31 @@ msgstr "Ошибка"
 msgid "delete file permanently"
 msgstr "удалить файл навсегда"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Удалено навсегда"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Имя"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Удалён"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} файлов"
 
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 8709b06612f4c687a87dfbabf4f88c47c05b8ad4..78d3f7898b96c174eacfe2b47376cf7eabc9389b 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <skoptev@ukr.net>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 05:30+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\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"
 "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"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 785b626c8796965dba1e0b12db1a39c2c2586323..293f03f39701fb0cc912ad9b9aac4d58e7850035 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -3,21 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis <reg.transifex.net@demitel.ru>, 2013.
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <k0ldbl00d@gmail.com>, 2012.
-# Mihail Vasiliev <mickvav@gmail.com>, 2012.
-#   <mpolr21@gmail.com>, 2012.
-# Sergey <sergey@markevich.ru>, 2013.
-#   <victor.dubiniuk@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\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 (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
-msgstr "Настройки"
+msgstr "Конфигурация"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "Невозможно установить"
 
@@ -101,10 +93,6 @@ msgstr "Установить имя пользователя для admin."
 msgid "Set an admin password."
 msgstr "становит пароль для admin."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Указать папку данных."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -125,79 +113,83 @@ msgstr "%s Вы не можете использовать точки в име
 msgid "%s set the database host."
 msgstr "%s задайте хост базы данных."
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Неверное имя пользователя и/или пароль Oracle"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль MySQL"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ошибка БД: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Вызываемая команда была: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Удалить этого пользователя из MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Пользователь MySQL '%s'@'%%' уже существует"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Удалить этого пользователя из MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Неверное имя пользователя и/или пароль Oracle"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "менее минуты"
+msgstr "несколько секунд назад"
 
 #: template.php:114
 msgid "1 minute ago"
@@ -245,20 +237,7 @@ msgstr "в прошлом году"
 
 #: template.php:124
 msgid "years ago"
-msgstr "годы назад"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "актуальная версия"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "проверка обновлений отключена"
+msgstr "несколько лет назад"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index bb845c09a23035d78670977ba146bdfd1fb3a682..4e774779e2411c7d86b2ecd16e8301ebb68a247c 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,27 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <icewind1991@gmail.com>, 2012.
-#   <jekader@gmail.com>, 2012.
-#   <lankme@gmail.com>, 2012.
-# Nick Remeslennikov <homolibere@gmail.com>, 2012.
-#   <rasperepodvipodvert@gmail.com>, 2012.
-#   <semen@sam002.net>, 2012.
-# Sergey <sergey@markevich.ru>, 2013.
-#   <sharov3@gmail.com>, 2012-2013.
-#   <skoptev@ukr.net>, 2012.
-#   <tony.mccourin@gmail.com>, 2011.
-# Victor Ashirov <victor.ashirov@gmail.com>, 2013.
-# Victor Bravo <>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
+# eurekafag <eurekafag@eureka7.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -36,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Загрузка из App Store запрещена"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Ошибка авторизации"
+msgstr "Ошибка аутентификации"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Ваше отображаемое имя было изменено."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Невозможно изменить отображаемое имя"
 
@@ -79,7 +69,7 @@ msgstr "Язык изменён"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Неверный запрос"
+msgstr "Неправильный запрос"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -131,52 +121,52 @@ msgstr "Ошибка в процессе обновления приложени
 msgid "Updated"
 msgstr "Обновлено"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "удален"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "отмена"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Невозможно удалить пользователя"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Группы"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Группа Администраторы"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "добавить группу"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Предоставте подходящее имя пользователя"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Ошибка создания пользователя"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Предоставте подходящий пароль"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -327,19 +317,19 @@ msgstr "Лог"
 msgid "Log level"
 msgstr "Уровень лога"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -410,7 +400,7 @@ msgstr "Получить приложения для синхронизации
 msgid "Show First Run Wizard again"
 msgstr "Показать помощник настройки"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Пароль"
 
@@ -434,82 +424,74 @@ msgstr "Новый пароль"
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Ваше отображаемое имя было изменено"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Невозможно изменить Ваше отображаемое имя"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Изменить отображаемое имя"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "e-mail"
+msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
-msgstr "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля"
+msgstr "Введите адрес электронной почты чтобы появилась возможность восстановления пароля"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Имя пользователя"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Создать"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Хранилище по-умолчанию"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Неограниченно"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Хранилище"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "изменить отображаемое имя"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "установить новый пароль"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "По-умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index c58d7a5f3a7d0a39769c7bcba4cff4d49ef35701..597c639b614f072d49ae0433d00bdba0735ea855 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <4671992@gmail.com>, 2012.
-# Denis  <reg.transifex.net@demitel.ru>, 2012.
-#   <semen@sam002.net>, 2012.
-# Victor Ashirov <victor.ashirov@gmail.com>, 2013.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\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"
 "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,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Не удалось удалить конфигурацию сервера"
@@ -58,281 +57,363 @@ msgstr "Сохранить настройки?"
 msgid "Cannot add server configuration"
 msgstr "Не получилось добавить конфигурацию сервера"
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Проверка соединения не удалась"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Вы действительно хотите удалить существующую конфигурацию сервера?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Подтверждение удаления"
 
-#: templates/settings.php:8
+#: 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 "<b>Внимание:</b>Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением. Пожалуйста, обратитесь к системному администратору, чтобы отключить одно из них."
 
-#: templates/settings.php:11
+#: 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 "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. "
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Конфигурация сервера"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Добавить конфигурацию сервера"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Сервер"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Базовый DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "По одному базовому DN в строке."
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN пользователя"
 
-#: templates/settings.php:45
+#: 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 "DN-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Фильтр входа пользователей"
 
-#: templates/settings.php:53
+#: 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 "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Определяет фильтр для применения при получении пользователей."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без заполнителя, например: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Фильтр группы"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Определяет фильтр для применения при получении группы."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без заполнения, например \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Настройки подключения"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Конфигурация активна"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Когда галочка снята, эта конфигурация будет пропущена."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Адрес резервного сервера"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Порт резервного сервера"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Отключение главного сервера"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Когда включено, ownCloud будет соединяться только с резервным сервером."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не используйте совместно с безопасными подключениями (LDAPS), это не сработает."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Отключить проверку сертификата SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендуется, используйте только для тестирования."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Кэш времени жизни"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Настройки каталога"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Поле отображаемого имени пользователя"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "База пользовательского дерева"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "По одной базовому DN пользователей в строке."
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Поисковые атрибуты пользователя"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Опционально; один атрибут на линию"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Поле отображаемого имени группы"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени группы ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "База группового дерева"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "По одной базовому DN групп в строке."
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Атрибуты поиска для группы"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Ассоциация Группа-Участник"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Специальные атрибуты"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Поле квота"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Квота по умолчанию"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Поле адресса эллектронной почты"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Правило именования Домашней Папки Пользователя"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index c66ccc74b9912194faa7e5db53e9fa3790a85b4c..d6d190c1eacb8600b3c61e178a477b622b2e1e0e 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Denis <reg.transifex.net@demitel.ru>, 2013.
-#   <sharov3@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
+# Denis <reg.transifex.net@demitel.ru>, 2013
+# adol <sharov3@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-12 15:10+0100\n"
-"PO-Revision-Date: 2013-02-12 10:43+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\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"
 "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"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 9bbd48bd6a316874d4106917da3549e8d41cb29e..06111cdf7c6ce9db02e06b9b4e3d5e9ce200339f 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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"
@@ -23,222 +20,226 @@ msgstr ""
 #: ajax/share.php:97
 #, php-format
 msgid "User %s shared a file with you"
-msgstr "Пользователь %s открыл Вам доступ к файлу"
+msgstr ""
 
 #: ajax/share.php:99
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr "Пользователь %s открыл Вам доступ к папке"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: 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"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Тип категории не предоставлен."
+msgstr ""
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr "Нет категории для добавления?"
+msgstr ""
 
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "Эта категория уже существует: %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 "Тип объекта не предоставлен."
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr "%s ID не предоставлен."
+msgstr ""
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Ошибка добавления %s в избранное."
+msgstr ""
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Нет категорий, выбранных для удаления."
+msgstr ""
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr "Ошибка удаления %s из избранного."
+msgstr ""
 
 #: js/config.php:34
 msgid "Sunday"
-msgstr "Воскресенье"
+msgstr ""
 
 #: js/config.php:35
 msgid "Monday"
-msgstr "Понедельник"
+msgstr ""
 
 #: js/config.php:36
 msgid "Tuesday"
-msgstr "Вторник"
+msgstr ""
 
 #: js/config.php:37
 msgid "Wednesday"
-msgstr "Среда"
+msgstr ""
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr "Четверг"
+msgstr ""
 
 #: js/config.php:39
 msgid "Friday"
-msgstr "Пятница"
+msgstr ""
 
 #: js/config.php:40
 msgid "Saturday"
-msgstr "Суббота"
+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"
 msgstr "Настройки"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
-msgstr "секунд назад"
+msgstr ""
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
-msgstr " 1 минуту назад"
+msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
-msgstr "{минуты} минут назад"
+msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "1 час назад"
+msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
-msgstr "{часы} часов назад"
+msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
-msgstr "сегодня"
+msgstr ""
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
-msgstr "вчера"
+msgstr ""
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
-msgstr "{дни} дней назад"
+msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
-msgstr "в прошлом месяце"
+msgstr ""
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
-msgstr "{месяцы} месяцев назад"
+msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
-msgstr "месяц назад"
+msgstr ""
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
-msgstr "в прошлом году"
+msgstr ""
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
-msgstr "лет назад"
+msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
-msgstr "Выбрать"
+msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Отмена"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Нет"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
-msgstr "Да"
+msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
-msgstr "Да"
+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 "Тип объекта не указан."
+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
@@ -250,15 +251,15 @@ msgstr "Ошибка"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "Имя приложения не указано."
+msgstr ""
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr "Требуемый файл {файл} не установлен!"
+msgstr ""
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr "Опубликовано"
+msgstr ""
 
 #: js/share.js:90
 msgid "Share"
@@ -266,207 +267,210 @@ msgstr "Сделать общим"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
-msgstr "Ошибка создания общего доступа"
+msgstr ""
 
 #: js/share.js:136
 msgid "Error while unsharing"
-msgstr "Ошибка отключения общего доступа"
+msgstr ""
 
 #: js/share.js:143
 msgid "Error while changing permissions"
-msgstr "Ошибка при изменении прав доступа"
+msgstr ""
 
 #: js/share.js:152
 msgid "Shared with you and the group {group} by {owner}"
-msgstr "Опубликовано для Вас и группы {группа} {собственник}"
+msgstr ""
 
 #: js/share.js:154
 msgid "Shared with you by {owner}"
-msgstr "Опубликовано для Вас {собственник}"
+msgstr ""
 
 #: js/share.js:159
 msgid "Share with"
-msgstr "Сделать общим с"
+msgstr ""
 
 #: js/share.js:164
 msgid "Share with link"
-msgstr "Опубликовать с ссылкой"
+msgstr ""
 
 #: js/share.js:167
 msgid "Password protect"
-msgstr "Защитить паролем"
+msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "Пароль"
+msgstr ""
 
 #: js/share.js:173
 msgid "Email link to person"
-msgstr "Ссылка на адрес электронной почты"
+msgstr ""
 
 #: js/share.js:174
 msgid "Send"
-msgstr "Отправить"
+msgstr ""
 
 #: js/share.js:178
 msgid "Set expiration date"
-msgstr "Установить срок действия"
+msgstr ""
 
 #: js/share.js:179
 msgid "Expiration date"
-msgstr "Дата истечения срока действия"
+msgstr ""
 
 #: js/share.js:211
 msgid "Share via email:"
-msgstr "Сделать общедоступным посредством email:"
+msgstr ""
 
 #: js/share.js:213
 msgid "No people found"
-msgstr "Не найдено людей"
+msgstr ""
 
 #: js/share.js:251
 msgid "Resharing is not allowed"
-msgstr "Рекурсивный общий доступ не разрешен"
+msgstr ""
 
 #: js/share.js:287
 msgid "Shared in {item} with {user}"
-msgstr "Совместное использование в {объект} с {пользователь}"
+msgstr ""
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Отключить общий доступ"
+msgstr ""
 
 #: js/share.js:320
 msgid "can edit"
-msgstr "возможно редактирование"
+msgstr ""
 
 #: js/share.js:322
 msgid "access control"
-msgstr "контроль доступа"
+msgstr ""
 
 #: js/share.js:325
 msgid "create"
-msgstr "создать"
+msgstr ""
 
 #: js/share.js:328
 msgid "update"
-msgstr "обновить"
+msgstr ""
 
 #: js/share.js:331
 msgid "delete"
-msgstr "удалить"
+msgstr ""
 
 #: js/share.js:334
 msgid "share"
-msgstr "сделать общим"
+msgstr ""
 
 #: js/share.js:368 js/share.js:564
 msgid "Password protected"
-msgstr "Пароль защищен"
+msgstr ""
 
 #: js/share.js:577
 msgid "Error unsetting expiration date"
-msgstr "Ошибка при отключении даты истечения срока действия"
+msgstr ""
 
 #: js/share.js:589
 msgid "Error setting expiration date"
-msgstr "Ошибка при установке даты истечения срока действия"
+msgstr ""
 
 #: js/share.js:604
 msgid "Sending ..."
-msgstr "Отправка ..."
+msgstr ""
 
 #: js/share.js:615
 msgid "Email sent"
-msgstr "Письмо отправлено"
+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 "Обновление прошло неудачно. Пожалуйста, сообщите об этом результате в <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 "Обновление прошло успешно. Немедленное перенаправление Вас на ownCloud."
+msgstr ""
 
 #: lostpassword/controller.php:48
 msgid "ownCloud password reset"
-msgstr "Переназначение пароля"
+msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "Сброс отправки email."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Не удалось выполнить запрос!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Имя пользователя"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
-msgstr "Сброс запроса"
+msgstr ""
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Ваш пароль был переустановлен"
+msgstr ""
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "На страницу входа"
+msgstr ""
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Новый пароль"
+msgstr ""
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
-msgstr "Переназначение пароля"
+msgstr ""
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Персональный"
+msgstr ""
 
 #: strings.php:6
 msgid "Users"
-msgstr "Пользователи"
+msgstr ""
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Приложения"
+msgstr ""
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Администратор"
+msgstr ""
 
 #: strings.php:9
 msgid "Help"
-msgstr "Помощь"
+msgstr ""
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Доступ запрещен"
+msgstr ""
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Облако не найдено"
+msgstr ""
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Редактирование категорий"
+msgstr ""
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -475,7 +479,7 @@ msgstr "Добавить"
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
 msgid "Security Warning"
-msgstr "Предупреждение системы безопасности"
+msgstr ""
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
@@ -489,120 +493,125 @@ msgstr ""
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
+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 "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом."
+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 "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает."
+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 "Для информации как правильно настроить Ваш сервер, пожалйста загляните в <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">документацию</a>."
+msgstr ""
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
-msgstr "Создать <strong>admin account</strong>"
+msgstr ""
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "Расширенный"
+msgstr ""
 
 #: templates/installation.php:64
 msgid "Data folder"
-msgstr "Папка данных"
+msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
-msgstr "Настроить базу данных"
+msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "будет использоваться"
+msgstr ""
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
-msgstr "Пользователь базы данных"
+msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
-msgstr "Пароль базы данных"
+msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
-msgstr "Имя базы данных"
+msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
-msgstr "Табличная область базы данных"
+msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
-msgstr "Сервер базы данных"
+msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
-msgstr "Завершение настройки"
+msgstr ""
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "веб-сервисы под Вашим контролем"
+msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
-msgstr "Выйти"
+msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "Автоматический вход в систему отклонен!"
+msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Если Вы недавно не меняли пароль, Ваш аккаунт может быть подвергнут опасности!"
+msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Пожалуйста, измените пароль, чтобы защитить ваш аккаунт еще раз."
+msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
-msgstr "Забыли пароль?"
+msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
-msgstr "запомнить"
+msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
-msgstr "Войти"
+msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
-msgstr "Альтернативные Имена"
+msgstr ""
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr "предыдущий"
+msgstr ""
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr "следующий"
+msgstr ""
 
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Обновление ownCloud до версии %s, это может занять некоторое время."
+msgstr ""
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index a742a13ade70dad9b3c43b33549f21d4b097dea6..097c3e00ba52324a0a277596148db622d922d297 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,16 +20,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Неполучается перенести %s - Файл с таким именем уже существует"
+msgstr ""
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr "Неполучается перенести %s "
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Невозможно переименовать файл"
+msgstr ""
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -41,22 +33,22 @@ msgstr "Файл не был загружен. Неизвестная ошибк
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Ошибка отсутствует, файл загружен успешно."
+msgstr "Ошибки нет, файл успешно загружен"
 
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Размер загружаемого файла превышает upload_max_filesize директиву в 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 "Размер загруженного"
+msgstr "Размер загружаемого файла превысил максимально допустимый в директиве MAX_FILE_SIZE, специфицированной в HTML-форме"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Загружаемый файл был загружен частично"
+msgstr "Загружаемый файл был загружен лишь частично"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
@@ -64,7 +56,7 @@ msgstr "Файл не был загружен"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Отсутствует временная папка"
+msgstr "Отсутствие временной папки"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -76,180 +68,192 @@ msgstr "Недостаточно места в хранилище"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr "Неверный каталог."
+msgstr ""
 
 #: appinfo/app.php:12
 msgid "Files"
-msgstr "Файлы"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Сделать общим"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "Удалить навсегда"
+msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
-msgstr "Переименовать"
+msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Ожидающий решения"
+msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
-msgstr "{новое_имя} уже существует"
+msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
-msgstr "отмена"
+msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
-msgstr "подобрать название"
+msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
-msgstr "отменить"
+msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
-msgstr "заменено {новое_имя} с {старое_имя}"
+msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
-msgstr "отменить действие"
+msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr "выполняется процесс удаления"
+msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
-msgstr "загрузка 1 файла"
+msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr "'.' является неверным именем файла."
+msgstr ""
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr "Имя файла не может быть пустым."
+msgstr ""
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "Некорректное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не допустимы."
+msgstr ""
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ваше хранилище переполнено, фалы больше не могут быть обновлены или синхронизированы!"
+msgstr ""
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Ваше хранилище почти полно ({usedSpacePercent}%)"
+msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Идёт подготовка к скачке Вашего файла. Это может занять некоторое время, если фалы большие."
+msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией"
+msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr "Не достаточно свободного места"
+msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "Загрузка отменена"
+msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена."
+msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "URL не должен быть пустым."
+msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "Неверное имя папки. Использование наименования 'Опубликовано' зарезервировано Owncloud"
+msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
-msgstr "Размер"
+msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "Изменен"
+msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
-msgstr "{количество} папок"
+msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
-msgstr "1 файл"
+msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
-msgstr "{количество} файлов"
+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 "Загрузить "
+msgstr ""
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr "Работа с файлами"
+msgstr ""
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Максимальный размер загружаемого файла"
+msgstr ""
 
 #: templates/admin.php:10
 msgid "max. possible: "
-msgstr "Максимально возможный"
+msgstr ""
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "Необходимо для множественной загрузки."
+msgstr ""
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "Включение ZIP-загрузки"
+msgstr ""
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0 без ограничений"
+msgstr ""
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "Максимальный размер входящих ZIP-файлов "
+msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
@@ -257,19 +261,19 @@ msgstr "Сохранить"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "Новый"
+msgstr ""
 
 #: templates/index.php:10
 msgid "Text file"
-msgstr "Текстовый файл"
+msgstr ""
 
 #: templates/index.php:12
 msgid "Folder"
-msgstr "Папка"
+msgstr ""
 
 #: templates/index.php:14
 msgid "From link"
-msgstr "По ссылке"
+msgstr ""
 
 #: templates/index.php:42
 msgid "Deleted files"
@@ -277,42 +281,42 @@ msgstr ""
 
 #: templates/index.php:48
 msgid "Cancel upload"
-msgstr "Отмена загрузки"
+msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "Здесь ничего нет. Загрузите что-нибудь!"
+msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Загрузить"
+msgstr "Загрузка"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Скрыть"
+msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Загрузка слишком велика"
+msgstr ""
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
+msgstr ""
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
-msgstr "Файлы сканируются, пожалуйста, подождите."
+msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
-msgstr "Текущее сканирование"
+msgstr ""
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Обновление кэша файловой системы... "
+msgstr ""
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index cd0001f8dac4f5030281f9c517f5a8c9f018194a..4690ff89165ba138409b45be7e365d54666c3bad 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: ru_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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Сохранение"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
-msgstr "Шифрование"
+msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ни один"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index 20a27154a727fc4159c4f307117c763636241123..96563330fbce198562678d83e5a05ca6d2636822 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,44 +19,51 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
-msgstr "Доступ разрешен"
+msgstr ""
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
-msgstr "Ошибка при конфигурировании хранилища Dropbox"
+msgstr ""
 
 #: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
-msgstr "Предоставить доступ"
+msgstr ""
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr "Пожалуйста представьте допустимый ключ приложения Dropbox и пароль."
+msgstr ""
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr "Ошибка настройки хранилища Google Drive"
+msgstr ""
 
-#: lib/config.php:423
+#: 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 "<b>Предупреждение:</b> \"smbclient\" не установлен. Подключение общих папок CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+msgstr ""
 
-#: lib/config.php:426
+#: 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 "<b>Предупреждение:</b> Поддержка FTP в PHP не включена или не установлена. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить ее."
+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 "Внешние системы хранения данных"
+msgstr ""
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr "Имя папки"
+msgstr ""
 
 #: templates/settings.php:10
 msgid "External storage"
@@ -65,15 +71,15 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Configuration"
-msgstr "Конфигурация"
+msgstr ""
 
 #: templates/settings.php:12
 msgid "Options"
-msgstr "Опции"
+msgstr ""
 
 #: templates/settings.php:13
 msgid "Applicable"
-msgstr "Применимый"
+msgstr ""
 
 #: templates/settings.php:33
 msgid "Add storage"
@@ -81,11 +87,11 @@ msgstr ""
 
 #: templates/settings.php:90
 msgid "None set"
-msgstr "Не задан"
+msgstr ""
 
 #: templates/settings.php:91
 msgid "All Users"
-msgstr "Все пользователи"
+msgstr ""
 
 #: templates/settings.php:92
 msgid "Groups"
@@ -93,7 +99,7 @@ msgstr "Группы"
 
 #: templates/settings.php:100
 msgid "Users"
-msgstr "Пользователи"
+msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
@@ -102,16 +108,16 @@ msgstr "Удалить"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr "Включить пользовательскую внешнюю систему хранения данных"
+msgstr ""
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
+msgstr ""
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr "Корневые сертификаты SSL"
+msgstr ""
 
 #: templates/settings.php:159
 msgid "Import Root Certificate"
-msgstr "Импортировать корневые сертификаты"
+msgstr ""
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index 7f31cb63091ddd5be7c19da7def8c80a4bac5030..2c8af92a3a6f50867d083821256d7b9beaf68a2a 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_RU/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 10:54+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "Пароль"
+msgstr ""
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr "Передать"
+msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr "%s имеет общий с Вами доступ к папке %s "
+msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr "%s имеет общий с Вами доступ к файлу %s "
+msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Загрузка"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
-msgstr "Предварительный просмотр недоступен"
+msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr "веб-сервисы под Вашим контролем"
+msgstr ""
diff --git a/l10n/ru_RU/files_trashbin.po b/l10n/ru_RU/files_trashbin.po
index f5351c3c646f1f07b3f26fb8ced82885874b66e1..958cf6f2dd639a28b1bdc6b28cd8bbcbc2871c37 100644
--- a/l10n/ru_RU/files_trashbin.po
+++ b/l10n/ru_RU/files_trashbin.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,60 +20,60 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "%s не может быть удалён навсегда"
+msgstr ""
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "%s не может быть восстановлен"
+msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: 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:114 js/trash.js:139
+#: 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 "удалить файл навсегда"
+msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
-msgstr "Удалить навсегда"
+msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Имя"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
-msgstr "Удалён"
+msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
-msgstr "1 папка"
+msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
-msgstr "{количество} папок"
+msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
-msgstr "1 файл"
+msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
-msgstr "{количество} файлов"
+msgstr ""
 
 #: 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"
@@ -82,4 +81,4 @@ msgstr "Удалить"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr "Удаленные файлы"
+msgstr ""
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 202ace6ab3c411ed5f838725059741d159993313..39fe47d2edf66429dbba1d7ccb768e1dc31edd91 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 51909e1d8168726f8ed2bd1803586eb17565fbd7..1172cc70fe77b01730df4c7ae1318e690d88af46 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
-# Дмитрий <langaru@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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"
@@ -20,65 +17,65 @@ msgstr ""
 "Language: ru_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:349
+#: app.php:357
 msgid "Help"
-msgstr "Помощь"
+msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
-msgstr "Персональный"
+msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
-msgstr "Пользователи"
+msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr "Приложения"
+msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
-msgstr "Админ"
+msgstr ""
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
-msgstr "Загрузка ZIP выключена."
+msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
-msgstr "Файлы должны быть загружены один за другим."
+msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
-msgstr "Обратно к файлам"
+msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
-msgstr "Выбранные файлы слишком велики для генерации zip-архива."
+msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
-msgstr "не может быть определено"
+msgstr ""
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr "Приложение не запущено"
+msgstr ""
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Ошибка аутентификации"
+msgstr ""
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Маркер истек. Пожалуйста, перезагрузите страницу."
+msgstr ""
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
-msgstr "Файлы"
+msgstr ""
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
@@ -86,7 +83,7 @@ msgstr "Текст"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr "Изображения"
+msgstr ""
 
 #: setup.php:34
 msgid "Set an admin username."
@@ -96,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,142 +113,133 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "Ваш веб сервер ещё не достаточно точно настроен для возможности синхронизации, т.к. похоже, что интерфейс WebDAV сломан."
+msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Пожалуйста проверте дважды <a href='%s'>гиды по установке</a>."
+msgstr ""
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "секунд назад"
+msgstr ""
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1 минуту назад"
+msgstr ""
 
 #: template.php:115
 #, php-format
 msgid "%d minutes ago"
-msgstr "%d минут назад"
+msgstr ""
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr "1 час назад"
+msgstr ""
 
 #: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr "%d часов назад"
+msgstr ""
 
 #: template.php:118
 msgid "today"
-msgstr "сегодня"
+msgstr ""
 
 #: template.php:119
 msgid "yesterday"
-msgstr "вчера"
+msgstr ""
 
 #: template.php:120
 #, php-format
 msgid "%d days ago"
-msgstr "%d дней назад"
+msgstr ""
 
 #: template.php:121
 msgid "last month"
-msgstr "в прошлом месяце"
+msgstr ""
 
 #: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr "%d месяцев назад"
+msgstr ""
 
 #: template.php:123
 msgid "last year"
-msgstr "в прошлом году"
+msgstr ""
 
 #: template.php:124
 msgid "years ago"
-msgstr "год назад"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s доступно. Получите <a href=\"%s\">more information</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "до настоящего времени"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "Проверка обновлений отключена"
+msgstr ""
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
-msgstr "Не удалось найти категорию \"%s\""
+msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index cc82d2d3a7ed990949563bfa60957967feca1718..34972e5304e5b241f1f8fbc08c282683f3c4108e 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,66 +19,70 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Невозможно загрузить список из App Store"
+msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Ошибка авторизации"
+msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: 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 "Группа уже существует"
+msgstr ""
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "Невозможно добавить группу"
+msgstr ""
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
-msgstr "Не удалось запустить приложение"
+msgstr ""
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr "Email сохранен"
+msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr "Неверный email"
+msgstr ""
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "Невозможно удалить группу"
+msgstr ""
 
 #: ajax/removeuser.php:24
 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"
-msgstr "Неверный запрос"
+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 ""
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "Невозможно удалить пользователя из группы %s"
+msgstr ""
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
@@ -92,11 +94,11 @@ msgstr ""
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
-msgstr "Отключить"
+msgstr ""
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Включить"
+msgstr ""
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -118,58 +120,58 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Сохранение"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "удалено"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
-msgstr "отменить действие"
+msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Группы"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
-msgstr "Группа Admin"
+msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
-msgstr "__язык_имя__"
+msgstr ""
 
 #: templates/admin.php:15
 msgid "Security Warning"
-msgstr "Предупреждение системы безопасности"
+msgstr ""
 
 #: templates/admin.php:18
 msgid ""
@@ -178,7 +180,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 "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера."
+msgstr ""
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -188,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 "Ваш веб сервер ещё не достаточно точно настроен для возможности синхронизации, т.к. похоже, что интерфейс WebDAV сломан."
+msgstr ""
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr "Пожалуйста проверте дважды <a href='%s'>гиды по установке</a>."
+msgstr ""
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -314,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr "Подробнее"
+msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
-msgstr "Меньше"
+msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
-msgstr "Версия"
+msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -334,60 +336,60 @@ 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 "Разработанный <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:11
 msgid "Add your App"
-msgstr "Добавить Ваше приложение"
+msgstr ""
 
 #: templates/apps.php:12
 msgid "More Apps"
-msgstr "Больше приложений"
+msgstr ""
 
 #: templates/apps.php:28
 msgid "Select an App"
-msgstr "Выбрать приложение"
+msgstr ""
 
 #: templates/apps.php:34
 msgid "See application page at apps.owncloud.com"
-msgstr "Обратитесь к странице приложений на apps.owncloud.com"
+msgstr ""
 
 #: templates/apps.php:36
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/apps.php:38
 msgid "Update"
-msgstr "Обновить"
+msgstr ""
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr "Документация пользователя"
+msgstr ""
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr "Документация администратора"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr "Документация online"
+msgstr ""
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr "Форум"
+msgstr ""
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr "Отслеживание ошибок"
+msgstr ""
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "Коммерческая поддержка"
+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>"
+msgstr ""
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
@@ -395,108 +397,100 @@ msgstr ""
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
-msgstr "Вновь показать помощника первоначальной настройки"
+msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
-msgstr "Пароль"
+msgstr ""
 
 #: templates/personal.php:38
 msgid "Your password was changed"
-msgstr "Ваш пароль был изменен"
+msgstr ""
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "Невозможно изменить Ваш пароль"
+msgstr ""
 
 #: templates/personal.php:40
 msgid "Current password"
-msgstr "Текущий пароль"
+msgstr ""
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "Новый пароль"
+msgstr ""
 
 #: templates/personal.php:44
 msgid "Change password"
-msgstr "Изменить пароль"
-
-#: templates/personal.php:56 templates/users.php:78
-msgid "Display Name"
-msgstr ""
-
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
 msgstr ""
 
-#: templates/personal.php:61
-msgid "Change display name"
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Электронная почта"
+msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
-msgstr "Адрес Вашей электронной почты"
+msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
-msgstr "Введите адрес электронной почты для возможности восстановления пароля"
+msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
-msgstr "Язык"
+msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
-msgstr "Помогите перевести"
+msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
-msgstr "WebDAV"
+msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере"
+msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
-msgstr "Создать"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:38
 msgid "Default Storage"
-msgstr "Хранилище по умолчанию"
+msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
-msgstr "Неограниченный"
+msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "Другой"
+msgstr "Другое"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
-msgstr "Хранилище"
+msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
-msgstr "назначить новый пароль"
+msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
-msgstr "По умолчанию"
+msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 8ebddb604b8679141af9e06efba4e96f1b396647..42a5e0fe723d58bafefd42a665e46f4d9400bd60 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +17,10 @@ msgstr ""
 "Language: ru_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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -41,7 +43,7 @@ msgstr ""
 
 #: js/settings.js:66
 msgid "Deletion failed"
-msgstr "Удаление не удалось"
+msgstr ""
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
@@ -55,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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 "<b>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете столкнуться с неожиданным поведением системы. Пожалуйста, обратитесь к системному администратору для отключения одного из них."
+msgstr ""
 
-#: templates/settings.php:11
+#: 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 "<b>Предупреждение:</b> Модуль PHP LDAP не установлен, бэкэнд не будет работать. Пожалуйста, обратитесь к Вашему системному администратору, чтобы установить его."
+msgstr ""
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
-msgstr "Хост"
+msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
+msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
-msgstr "База DN"
+msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr "Одно базовое DN на линию"
+msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
+msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
-msgstr "DN пользователя"
+msgstr ""
 
-#: templates/settings.php:45
+#: 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 "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
+msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
-msgstr "Пароль"
+msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
+msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
-msgstr "Фильтр имен пользователей"
+msgstr ""
 
-#: templates/settings.php:53
+#: 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 "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
+msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
+msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
-msgstr "Фильтр списка пользователей"
+msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr "Задает фильтр, применяемый при получении пользователей."
+msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
+msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
-msgstr "Групповой фильтр"
+msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Задает фильтр, применяемый при получении групп."
+msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
+msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
-msgstr "Порт"
+msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
-msgstr "Использовать TLS"
+msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
+msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
-msgstr "Выключить проверку сертификата SSL."
+msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
+msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
-msgstr "Не рекомендовано, используйте только для тестирования."
+msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
-msgstr "в секундах. Изменение очищает кэш."
+msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr "Поле, отображаемое как имя пользователя"
+msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
+msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
-msgstr "Базовое дерево пользователей"
+msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr "Одно пользовательское базовое DN на линию"
+msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr "Поле, отображаемое как имя группы"
+msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
+msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
-msgstr "Базовое дерево групп"
+msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr "Одно групповое базовое DN на линию"
+msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
-msgstr "Связь член-группа"
+msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
-msgstr "в байтах"
+msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
+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:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
-msgstr "Помощь"
+msgstr ""
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 48ae554ac04cbfd0015c4bfea1ba26787f5ee12d..b2e915245745600192a7e98ad1ce5a91abc8e19d 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <cdewqazxsqwe@gmail.com>, 2013.
-#   <cdewqazxsqwe@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2013
+# AnnaSch <cdewqazxsqwe@gmail.com>, 2012
+# skoptev <skoptev@ukr.net>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 10:01+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr "WebDAV аутентификация"
+msgstr ""
 
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr "URL: http://"
+msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index f251c59c3182f8d9ecd5b298a83faa5952f912f3..3a820237c42bdbe7c14916eac3b2ca793e8759c1 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
-# Chamara Disanayake <chamara@nic.lk>, 2012.
-#   <thanojar@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +146,7 @@ msgstr "සැප්තැම්බර්"
 
 #: js/config.php:54
 msgid "October"
-msgstr "ඔක්තෝබර්"
+msgstr "ඔක්තෝබර"
 
 #: js/config.php:55
 msgid "November"
@@ -161,77 +158,81 @@ msgstr "දෙසැම්බර්"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "සැකසුම්"
+msgstr "සිටුවම්"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 මිනිත්තුවකට පෙර"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "තෝරන්න"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "නැහැ"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "ඔව්"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "එපා"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "හරි"
 
@@ -296,9 +297,9 @@ msgstr "යොමුවක් මඟින් බෙදාගන්න"
 msgid "Password protect"
 msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
-msgstr "මුර පදය "
+msgstr "මුර පදය"
 
 #: js/share.js:173
 msgid "Email link to person"
@@ -399,24 +400,27 @@ msgstr "ownCloud මුරපදය ප්‍රත්‍යාරම්භ ක
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "ඉල්ලීම අසාර්ථකයි!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "පරිශීලක නම"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -430,7 +434,7 @@ msgstr "පිවිසුම් පිටුවට"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "නව මුර පදයක්"
+msgstr "නව මුරපදය"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -470,7 +474,7 @@ msgstr "ප්‍රභේදයන් සංස්කරණය"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "එක් කරන්න"
+msgstr "එකතු කරන්න"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -522,37 +526,37 @@ msgstr "දියුණු/උසස්"
 msgid "Data folder"
 msgstr "දත්ත ෆෝල්ඩරය"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "දත්ත සමුදාය හැඩගැසීම"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "දත්තගබඩා භාවිතාකරු"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "දත්තගබඩාවේ මුරපදය"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "දත්තගබඩාවේ නම"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "දත්තගබඩා සේවාදායකයා"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
@@ -560,37 +564,42 @@ msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 msgid "web services under your control"
 msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "නික්මීම"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "මුරපදය අමතකද?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "මතක තබාගන්න"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "ප්‍රවේශවන්න"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 51ff536352364386c4958240b4e42becfb3e9834..96681697da4ddf93282a82be035ad81290a88105 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
-# Chamara Disanayake <chamara@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "නිවැරදි ව ගොනුව උඩුගත කෙරිනි"
+msgstr "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි"
 
 #: ajax/upload.php:27
 msgid ""
@@ -58,11 +52,11 @@ msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණ
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "කිසිදු ගොනවක් උඩුගත නොවිනි"
+msgstr "ගොනුවක් උඩුගත නොවුණි"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක"
+msgstr "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -80,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "ගොනු"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "බෙදා හදා ගන්න"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "මකන්න"
+msgstr "මකා දමන්න"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ප්‍රතිස්ථාපනය කරන්න"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "නමක් යෝජනා කරන්න"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "අත් හරින්න"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 ගොනුවක් උඩගත කෙරේ"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -154,72 +152,80 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "යොමුව හිස් විය නොහැක"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
-msgstr "උඩුගත කිරීම"
+msgstr "උඩුගත කරන්න"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -277,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "බාගත කිරීම"
+msgstr "බාන්න"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
 
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 7af077ac2a7fdaca427df6170f8bc67316e80395..02b12790e76fd96ce318a04bb0ae6abf8c6388c8 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "සුරැකෙමින් පවතී..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "කිසිවක් නැත"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index cafe37e2a68f763ee88a2d9d0930977a4f472531..73a6fe826e69c57498a05afb2b629cf9a9aeda06 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +37,26 @@ msgstr "කරුණාකර වලංගු Dropbox යෙදුම් යත
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
-#: lib/config.php:423
+#: 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:426
+#: 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 "භාහිර ගබඩාව"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 6308f9a772fc3f12d7c8f20cb604b88ccf047f1c..8f47f1b79b7944dcc07becb00181c755a1593242 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 05:59+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "මුරපදය"
+msgstr "මුර පදය"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr "යොමු කරන්න"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr "භාගත කරන්න"
+msgstr "බාන්න"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "පූර්වදර්ශනයක් නොමැත"
 
-#: templates/public.php:35
+#: 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 74223174167232bd92758bc42425e0b9f3e9010d..e024e00af13958c6b3cfd82668a69fb6b03ba4d3 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -39,31 +39,31 @@ msgstr "දෝෂයක්"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "නම"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index 66e6bcb8f644c6f1fc1e129650ebfd149ba9a31b..5106a985d4fbecb2105824e6822a23cb35bb9caf 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +40,17 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 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"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index db9dcb3fcd2e9bb395249b94bb69520c7f733ee6..072c2add51f2ddd10c27db71fb0dbd46b3c3edcd 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
-#   <awantha14@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,47 +17,47 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "උදව්"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "පෞද්ගලික"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "යෙදුම්"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "පරිපාලක"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "ගොනු වෙතට නැවත යන්න"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -69,7 +67,7 @@ msgstr "යෙදුම සක්‍රිය කර නොමැත"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "සත්‍යාපනය කිරීමේ දෝශයක්"
+msgstr "සත්‍යාපන දෝෂයක්"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -95,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -241,19 +239,6 @@ msgstr "පෙර අවුරුද්දේ"
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s යොදාගත හැක. <a href=\"%s\">තව විස්තර</a> ලබාගන්න"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "යාවත්කාලීනයි"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "යාවත්කාලීන බව පරීක්ෂණය අක්‍රියයි"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 3f13c351de88208ca82378f7d0d2b8a100ce40fe..64e42fb142b07bbf1346fe664048f218f95d4a66 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
-# Chamara Disanayake <chamara@nic.lk>, 2012.
-#   <thanojar@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "සත්‍යාපන දෝෂයක්"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -67,7 +68,7 @@ msgstr "භාෂාව ාවනස් කිරීම"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "අවලංගු අයදුම"
+msgstr "අවලංගු අයැදුමක්"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -97,7 +98,7 @@ msgstr "අක්‍රිය කරන්න"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "ක්‍රියත්මක කරන්න"
+msgstr "සක්‍රිය කරන්න"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -119,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
-msgstr "සමූහය"
+msgstr "කණ්ඩායම්"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "කාණ්ඩ පරිපාලක"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "මකා දමනවා"
+msgstr "මකා දමන්න"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -254,7 +255,7 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "හුවමාරු කිරීම"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
@@ -266,7 +267,7 @@ msgstr ""
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "යොමු සලසන්න"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
@@ -274,19 +275,19 @@ 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"
@@ -309,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "ලඝුව"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,9 +399,9 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
-msgstr "මුරපදය"
+msgstr "මුර පදය"
 
 #: templates/personal.php:38
 msgid "Your password was changed"
@@ -422,82 +423,74 @@ msgstr "නව මුරපදය"
 msgid "Change password"
 msgstr "මුරපදය වෙනස් කිරීම"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "ඔබගේ විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "භාෂාව"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "පරිවර්ථන සහය"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "තනන්න"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "වෙනත්"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index bec52d2d4837d193ba68b8b354d5b18e8c9066a9..bf7836dc057fdac6dc42255bb6e7ec27fe71efd5 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "සත්කාරකය"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "පරිශීලක පිවිසුම් පෙරහන"
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "පරිශීලක ලැයිස්තු පෙරහන"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "කණ්ඩායම් පෙරහන"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "තොට"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS භාවිතා කරන්න"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "උදව්"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index a6141d359c90502e160602e73ecdcac30140a92c..50163948c6c648c760abbc582de5aa7a4db20171 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anushke Guneratne <anushke@gmail.com>, 2012.
+# Anushke Guneratne <anushke@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 7afee22acfcae8afd38da4d530df06de089475a9..fa7bfd1c9efe79167e3de8774df0739ef7fddd04 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-03-22 00:03+0100\n"
-"PO-Revision-Date: 2013-03-21 23:03+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -237,9 +241,11 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566
-#: js/share.js:578
+#: 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 ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:606
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -319,59 +325,59 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:276
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:311
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:314
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:317
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:323
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:357 js/share.js:553
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:578
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:593
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 312a9144bf86a10ae0b52fe9646aafd2bedf82e7..98060efa362ff91eb49974421a21089ecc8c5ea1 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index eb687048cabbdc79857a0ba08158f5a8a2ef1f25..b91e38b4ebf15d8980ae62451b6e879c2f243314 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 685594af3ea5fe4aa1f9cbc87f09f987949e8a62..62d305b600416e89b7b505f8909b5b786c517d64 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 942e60b0498d651b2cae2ea7f39ec94250e84b0b..489876c2baa239e0312b17f1a4e55392a18aba53 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 9e904b876180ea77acc96abdfa70d5a29b0ae444..101816d2a65655db3cf2cf681413baeea312c405 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
diff --git a/l10n/sk/files_versions.po b/l10n/sk/files_versions.po
index c273fd68fbdc2917eb6b2edc2afdb6c32b0352ce..e61ebf4f94365ff128f53db1ee283eebcb58a1fb 100644
--- a/l10n/sk/files_versions.po
+++ b/l10n/sk/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 68541eae87db4abad53a83e44f7fd6060d977b48..d2b85b1a0fc16e387102dcb0d73aa7e629283a03 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:282 setup.php:386 setup.php:395 setup.php:413 setup.php:423
-#: setup.php:432 setup.php:461 setup.php:527 setup.php:553 setup.php:560
-#: setup.php:571 setup.php:578 setup.php:587 setup.php:595 setup.php:604
-#: setup.php:610
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:283 setup.php:387 setup.php:396 setup.php:414 setup.php:424
-#: setup.php:433 setup.php:462 setup.php:528 setup.php:554 setup.php:561
-#: setup.php:572 setup.php:588 setup.php:596 setup.php:605
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:850
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 0c10073e8f9c9281c3a991802bb5314b6c4cf922..09d08c8666ae8b12d490ac17261f8c2a2c200635 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index a22107c718ce8de2310f3769d1bac920a21f2892..2dd52e55933899c067b573b71c12589eeee30201 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 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 ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index eb6e13c58c0b8df5ce71710b079c030a8f6d3010..7eac54f7db7adbbda009f2a746536d514912230e 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/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-02-09 00:12+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 4977691c438de6432bdc304cd8a13f664ba45e3f..2324455d4f925b6b21dd55bd75b5c86a86218f30 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# georg <georg007@gmail.com>, 2013.
-#   <intense.feel@gmail.com>, 2011, 2012.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <martin.babik@gmail.com>, 2012.
-#   <mehturt@gmail.com>, 2013.
-# Roman Priesol <roman@priesol.net>, 2012.
-#   <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -167,75 +161,79 @@ msgstr "December"
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pred minútou"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minútami"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "Pred 1 hodinou."
+msgstr "Pred 1 hodinou"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pred {days} dňami"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "pred rokmi"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Výber"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nie"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Áno"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nie"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -300,7 +298,7 @@ msgstr "Zdieľať cez odkaz"
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Heslo"
 
@@ -403,24 +401,27 @@ msgstr "Obnovenie hesla pre ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Odkaz pre obnovenie hesla obdržíte e-mailom."
+#: 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 "Odkaz na obnovenie hesla bol odoslaný na Vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si Váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Obnovovací email bol odoslaný."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Požiadavka zlyhala!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Odkaz pre obnovenie hesla obdržíte e-mailom."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Prihlasovacie meno"
+msgstr "Meno používateľa"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Požiadať o obnovenie"
 
@@ -454,7 +455,7 @@ msgstr "Aplikácie"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Administrácia"
+msgstr "Administrátor"
 
 #: strings.php:9
 msgid "Help"
@@ -470,7 +471,7 @@ msgstr "Nenájdené"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Úprava kategórií"
+msgstr "Upraviť kategórie"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -526,75 +527,80 @@ msgstr "Rozšírené"
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "bude použité"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Hostiteľ databázy"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tabuľkový priestor databázy"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 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"
+msgstr "webové služby pod Vašou kontrolou"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatické prihlásenie bolo zamietnuté!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "V nedávnej dobe ste nezmenili svoje heslo, Váš účet môže byť kompromitovaný."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie Vášho účtu"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "zapamätať"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Prihlásiť sa"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternatívne prihlasovanie"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index a02bd8e28430789fc11218c9ee7940af918097ca..f3446dad3f47e2b28780548401543dc30207a78f 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# georg <georg007@gmail.com>, 2013.
-#   <intense.feel@gmail.com>, 2012.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <martin.babik@gmail.com>, 2012.
-# Martin Zatroch <zatroch.martin@gmail.com>, 2013.
-# Roman Priesol <roman@priesol.net>, 2012.
-#   <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 12:51+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -34,10 +28,6 @@ msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
 msgid "Could not move %s"
 msgstr "Nie je možné presunúť %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nemožno premenovať súbor"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol odoslaný. Neznáma chyba"
@@ -55,19 +45,19 @@ msgstr "Nahraný súbor predčil  konfiguračnú direktívu upload_max_filesize
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Nahrávaný súbor presiahol MAX_FILE_SIZE direktívu, ktorá bola špecifikovaná v HTML formulári"
+msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Nahrávaný súbor bol iba čiastočne nahraný"
+msgstr "Ukladaný súbor sa nahral len čiastočne"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Žiaden súbor nebol nahraný"
+msgstr "Žiadny súbor nebol uložený"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Chýbajúci dočasný priečinok"
+msgstr "Chýba dočasný priečinok"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -85,55 +75,59 @@ msgstr "Neplatný priečinok"
 msgid "Files"
 msgstr "Súbory"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Zdieľať"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "Odstrániť"
+msgstr "Zmazať"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Čaká sa"
+msgstr "Prebieha"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "nahradiť"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "pomôcť s menom"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "vykonať zmazanie"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "nahrávanie súborov"
 
@@ -159,69 +153,77 @@ msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchroniz
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
+msgstr "Nedá sa odoslať Váš súbor, pretože je to priečinok, alebo je jeho veľkosť 0 bajtov"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nie je k dispozícii dostatok miesta"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL nemôže byť prázdne"
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Meno"
+msgstr "Názov"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} súborov"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Neplatný názov priečinka. Názov \"Shared\" je rezervovaný pre ownCloud"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Nemožno premenovať súbor"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Odoslať"
@@ -260,7 +262,7 @@ msgstr "Uložiť"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "Nový"
+msgstr "Nová"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -282,37 +284,37 @@ msgstr "Zmazané súbory"
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nemáte oprávnenie na zápis."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Stiahnuť"
+msgstr "SÅ¥ahovanie"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Nezdielať"
+msgstr "Zrušiť zdieľanie"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Odosielaný súbor je príliš veľký"
+msgstr "Nahrávanie je príliš veľké"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Práve prezerané"
 
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 232ee99f2fe6e513118dcd58eea9e0934d11977b..f0b5225a7cb90f01e21ba2bbaff260e89d0064a1 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# georg <georg007@gmail.com>, 2013.
-#   <intense.feel@gmail.com>, 2012.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-11 15:39+0100\n"
-"PO-Revision-Date: 2013-02-11 13:10+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +18,87 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "Heslo úspešne zmenené."
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Ukladám..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Å ifrovanie"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifrovanie súborov nastavené."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "Povolené"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+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:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Uvedené typy súborov nebudú šifrované:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Nešifrovať uvedené typy súborov"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "Nastavenie obnovy súborov aktualizované"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Žiadne"
+#: templates/settings-personal.php:28
+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 457ddf4a038422a70bf5c0149a2996bdea5076b1..637feb1c20cbe72229076266218ef9690297d584 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2012.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <martin.babik@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -40,19 +38,26 @@ msgstr "Zadajte platný kľúč aplikácie a heslo Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba pri konfigurácii úložiska Google drive"
 
-#: lib/config.php:423
+#: 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 "<b>Upozornenie:</b> \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje."
 
-#: lib/config.php:426
+#: 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 "<b>Upozornenie:</b> Podpora FTP v PHP nie je povolená alebo nainštalovaná. Nie je možné pripojenie oddielov FTP. Požiadajte administrátora systému, nech ho nainštaluje."
 
+#: 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 "<b>Varovanie:</b> nie je nainštalovaná, alebo povolená, podpora Curl v PHP. Nie je možné pripojenie oddielov ownCloud, WebDAV, či GoogleDrive. Prosím požiadajte svojho administrátora systému, nech ju nainštaluje."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externé úložisko"
@@ -100,7 +105,7 @@ msgstr "Používatelia"
 #: templates/settings.php:113 templates/settings.php:114
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr "Odstrániť"
+msgstr "Zmazať"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index b964369a8b050d7acb9bfa81bc430bfa39d0a6bd..cb69a040d959dda1cb35129e6a16f85604ddb8bd 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2012.
-#   <martin.babik@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 02:02+0200\n"
-"PO-Revision-Date: 2012-10-01 08:36+0000\n"
-"Last-Translator: martinb <martin.babik@gmail.com>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "Heslo"
 msgid "Submit"
 msgstr "Odoslať"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s zdieľa s vami priečinok %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s zdieľa s vami súbor %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr "Stiahnuť"
+msgstr "SÅ¥ahovanie"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Žiaden náhľad k dispozícii pre"
 
-#: templates/public.php:37
+#: 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 8611677a171a7cc78308b44a31abd06b2e1d2445..28114d1724b98ab727699798850a5e954164025c 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# georg <georg007@gmail.com>, 2013.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Nemožno zmazať %s navždy"
 msgid "Couldn't restore %s"
 msgstr "Nemožno obnoviť %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "vykonať obnovu"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Chyba"
 
@@ -41,31 +39,31 @@ msgstr "Chyba"
 msgid "delete file permanently"
 msgstr "trvalo zmazať súbor"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
-msgstr "Meno"
+msgstr "Názov"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Zmazané"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} súborov"
 
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 0face773183b617945fb1fc726a3de8a9641e913..2e4b2d84383153032a2fe704fdada6c6797683cf 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# georg <georg007@gmail.com>, 2013.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <martin.babik@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
-"PO-Revision-Date: 2013-02-28 15:20+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "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"
@@ -43,11 +40,11 @@ msgstr "chyba"
 msgid "File %s could not be reverted to version %s"
 msgstr "Súbor %s nemohol byť obnovený na verziu %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Nie sú dostupné žiadne staršie verzie"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Nevybrali ste cestu"
 
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 516153711f5d4a8b12dab9eb3ae3eaa038227051..1fe14c6c0c388796336b7c9e1fbef0cf2e2daa41 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <martin.babik@gmail.com>, 2012.
-# Roman Priesol <roman@priesol.net>, 2012.
-#   <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
@@ -21,47 +18,47 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Osobné"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Používatelia"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Aplikácie"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Administrátor"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Sťahovanie súborov ZIP je vypnuté."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Súbory musia byť nahrávané jeden za druhým."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Späť na súbory"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Zvolené súbory sú príliš veľké na vygenerovanie zip súboru."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nedá sa zistiť"
 
@@ -97,10 +94,6 @@ msgstr "Zadajte používateľské meno administrátora."
 msgid "Set an admin password."
 msgstr "Zadajte heslo administrátora."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Zadajte priečinok pre dáta."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 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:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "Nie je možné pripojiť sa k Oracle"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podozrivý príkaz bol: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Používateľ '%s'@'localhost' už v MySQL existuje."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Používateľ '%s'@'%%' už v MySQL existuje"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
@@ -197,7 +194,7 @@ msgstr "pred sekundami"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "pred 1 minútou"
+msgstr "pred minútou"
 
 #: template.php:115
 #, php-format
@@ -243,19 +240,6 @@ msgstr "minulý rok"
 msgid "years ago"
 msgstr "pred rokmi"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s je dostupné. Získať <a href=\"%s\">pre viac informácií</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "aktuálny"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "sledovanie aktualizácií je vypnuté"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 7d1cd89b189894c47de72ceab5255aa49f324ac2..85f9ff21ce813647300255c8c79d1993f2ab1708 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <intense.feel@gmail.com>, 2011, 2012.
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <martin.babik@gmail.com>, 2012.
-# Roman Priesol <roman@priesol.net>, 2012.
-#   <typhoon@zoznam.sk>, 2012.
-#   <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
@@ -27,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nie je možné nahrať zoznam z App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Chyba pri autentifikácii"
+msgstr "Chyba autentifikácie"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Vaše zobrazované meno bolo zmenené."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Nemožno zmeniť zobrazované meno"
 
@@ -100,7 +99,7 @@ msgstr "Zakázať"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Povoliť"
+msgstr "Zapnúť"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -122,52 +121,52 @@ msgstr "chyba pri aktualizácii aplikácie"
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Ukladám..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "zmazané"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Nemožno odobrať používateľa"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Správca skupiny"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "Odstrániť"
+msgstr "Zmazať"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "pridať skupinu"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Musíte zadať platné používateľské meno"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Chyba pri vytváraní používateľa"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Musíte zadať platné heslo"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -318,19 +317,19 @@ msgstr "Záznam"
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +400,7 @@ msgstr "Získať aplikácie na synchronizáciu Vašich súborov"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Heslo"
 
@@ -425,82 +424,74 @@ msgstr "Nové heslo"
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Zobrazované meno"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Vaše zobrazované meno bolo zmenené"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Nemožno zmeniť Vaše zobrazované meno"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Zmeniť zobrazované meno"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "Obnovenie hesla administrátora"
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Predvolené úložisko"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Nelimitované"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Úložisko"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "zmeniť zobrazované meno"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "nastaviť nové heslo"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 5c221f7f0731688ccc6056b0d260181371abf9f6..b0224011f40d9ecb25cb0ef2bce2b8107f963638 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-# Roman Priesol <roman@priesol.net>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
@@ -19,6 +18,10 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr "Nepodarilo sa vymazať mapovania."
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Zlyhalo zmazanie nastavenia servera."
@@ -55,281 +58,363 @@ msgstr "Ponechať nastavenia?"
 msgid "Cannot add server configuration"
 msgstr "Nemožno pridať nastavenie servera"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr "mapovanie vymazané"
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Úspešné"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Chyba"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Test pripojenia bol úspešný"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Test pripojenia zlyhal"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Naozaj chcete zmazať súčasné nastavenie servera?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potvrdiť vymazanie"
 
-#: templates/settings.php:8
+#: 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 "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth nie sú kompatibilné. Môže nastávať neočakávané správanie. Požiadajte administrátora systému aby jednu z nich zakázal."
 
-#: templates/settings.php:11
+#: 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 "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Nastavenia servera"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Pridať nastavenia servera."
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Hostiteľ"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Základné DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Jedno základné DN na riadok"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Používateľské DN"
 
-#: templates/settings.php:45
+#: 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 "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter prihlásenia používateľov"
 
-#: templates/settings.php:53
+#: 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 "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter zoznamov používateľov"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definuje použitý filter, pre získanie používateľov."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filter skupiny"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definuje použitý filter, pre získanie skupín."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavenie pripojenia"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Nastavenia sú aktívne "
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ak nie je zaškrtnuté, nastavenie bude preskočené."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Záložný server (kópia) hosť"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Záložný server (kópia) port"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Zakázať hlavný server"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Pri zapnutí sa ownCloud pripojí len k záložnému serveru."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Použi TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Nepoužívajte pre pripojenie LDAPS, zlyhá."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnúť overovanie SSL certifikátu."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Nie je doporučované, len pre testovacie účely."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Životnosť objektov v cache"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavenie priečinka"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena používateľa"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Základný používateľský strom"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Jedna používateľská základná DN na riadok"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Atribúty vyhľadávania používateľov"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Voliteľné, jeden atribút na jeden riadok"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Základný skupinový strom"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Jedna skupinová základná DN na riadok"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atribúty vyhľadávania skupín"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Priradenie člena skupiny"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Špeciálne atribúty"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Pole kvóty"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Predvolená kvóta"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pre nastavenie mena používateľského priečinka dát"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
 
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr "Interné používateľské meno"
+
+#: 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 "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách bude číslo byť pridané / odobrané. Interné používateľské meno sa používa na identifikáciu používateľa interne. Je to tiež predvolený názov používateľského domovského priečinka v ownCloud. To je tiež port vzdialeného URL, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo mapovaných (pridaných) LDAP používateľov."
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr "Atribút interného používateľského mena:"
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr "Prepísať UUID detekciu"
+
+#: 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 "UUID atribút:"
+
+#: 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 "Test nastavenia"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index b3a30b89ca6593ebd560e116497fcb98e68a4472..b0cb3100e75ec1b3fb97fd269469b2cb9bbd1ae2 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marián Hvolka <marian.hvolka@stuba.sk>, 2013.
-#   <zatroch.martin@gmail.com>, 2012.
+# mhh <marian.hvolka@stuba.sk>, 2013
+# martin <zatroch.martin@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-31 00:27+0100\n"
-"PO-Revision-Date: 2013-01-30 08:31+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "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"
@@ -27,7 +27,7 @@ msgstr "WebDAV overenie"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 6a4197b8c3ee68ea8dac40d62707326a12af9cc2..e80889bc91d701441e6da4fd4f496f1c502a6812 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <>, 2013.
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-#   <peter.perosa@gmail.com>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
-#   <urossolar@hotmail.com>, 2012.
+# mateju <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -166,75 +161,79 @@ msgstr "december"
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minutami"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "pred 1 uro"
+msgstr "Pred 1 uro"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "pred {hours} urami"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "pred {days} dnevi"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "pred {months} meseci"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "let nazaj"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Izbor"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ne"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ne"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "V redu"
 
@@ -299,7 +298,7 @@ msgstr "Omogoči souporabo preko povezave"
 msgid "Password protect"
 msgstr "Zaščiti z geslom"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Geslo"
 
@@ -337,7 +336,7 @@ msgstr "V souporabi v {item} z {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Odstrani souporabo"
+msgstr "Prekliči souporabo"
 
 #: js/share.js:320
 msgid "can edit"
@@ -402,24 +401,27 @@ msgstr "Ponastavitev gesla za oblak ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Za ponastavitev gesla uporabite povezavo: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
+#: 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 "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Sporočilo z navodili za ponastavitev gesla je poslana na vaš elektronski naslov."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Zahteva je spodletela!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Uporabniško Ime"
+msgstr "Uporabniško ime"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Zahtevaj ponovno nastavitev"
 
@@ -525,37 +527,37 @@ msgstr "Napredne možnosti"
 msgid "Data folder"
 msgstr "Podatkovna mapa"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "bo uporabljen"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Uporabnik podatkovne zbirke"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Končaj namestitev"
 
@@ -563,37 +565,42 @@ msgstr "Končaj namestitev"
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, 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
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Samodejno prijavljanje je zavrnjeno!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Spremenite geslo za izboljšanje zaščite računa."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ali ste pozabili geslo?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "zapomni si"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Druge prijavne možnosti"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 17385d0ac995522b3471924f7d1c3b989639e49c..aa07ee986036434b0dadb0a3755cdaba7156ed1a 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-#   <peter.perosa@gmail.com>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
-#   <urossolar@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-12 02:09+0200\n"
-"PO-Revision-Date: 2013-04-11 18:00+0000\n"
-"Last-Translator: mateju <>\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"
 "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"
@@ -32,17 +27,13 @@ msgstr "Ni mogoče premakniti %s - datoteka s tem imenom že obstaja"
 msgid "Could not move %s"
 msgstr "Ni mogoče premakniti %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Ni mogoče preimenovati datoteke"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr "Ni poslane nobene datoteke. Neznana napaka."
+msgstr "Ni poslane datoteke. Neznana napaka."
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Datoteka je uspešno poslana."
+msgstr "Datoteka je uspešno naložena."
 
 #: ajax/upload.php:27
 msgid ""
@@ -57,11 +48,11 @@ msgstr "Poslana datoteka presega velikost, ki jo določa parameter največje dov
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Datoteka je le delno naložena"
+msgstr "Poslan je le del datoteke."
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Nobena datoteka ni bila naložena"
+msgstr "Ni poslane datoteke"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -83,55 +74,59 @@ msgstr "Neveljavna mapa."
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Souporaba"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr "Izbriši trajno"
+msgstr "Izbriši dokončno"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "izvedi opravilo brisanja"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Pošiljanje 1 datoteke"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "poteka pošiljanje datotek"
 
@@ -157,69 +152,77 @@ msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in us
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Mesto za shranjevanje je skoraj polno ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, če je datoteka zelo velika."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Pošiljanje ni mogoče, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov."
+msgstr "Pošiljanja ni mogoče izvesti, saj gre za mapo oziroma datoteko velikosti 0 bajtov."
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Na voljo ni dovolj prostora."
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazna vrednost."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Napaka"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} datotek"
 
+#: 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 "Ni mogoče preimenovati datoteke"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Pošlji"
@@ -258,7 +261,7 @@ msgstr "Shrani"
 
 #: templates/index.php:7
 msgid "New"
-msgstr "Nova"
+msgstr "Novo"
 
 #: templates/index.php:10
 msgid "Text file"
@@ -280,37 +283,37 @@ msgstr "Izbrisane datoteke"
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Za to mesto ni ustreznih dovoljenj za pisanje."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Odstrani iz souporabe"
+msgstr "Prekliči souporabo"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Prekoračenje omejitve velikosti"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
 
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 05ce9505eb29843149ffa0e73d3632696d7265ba..b690829c5b1cc1fc8d1e802ae651353a91cd0687 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-13 00:05+0100\n"
-"PO-Revision-Date: 2013-03-12 14:30+0000\n"
-"Last-Translator: mateju <>\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"
 "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,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Poteka shranjevanje ..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Å ifriranje"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Šifriranje datotek je omogočeno."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Navedene vrste datotek ne bodo Å¡ifrirane:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Ne Å¡ifriraj navedenih vrst datotek:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Brez"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 581315d1d25aa6eee1bba9a369449a9215dafb57..17bd9c211403aa0138ea0da957019b006469e364 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
+# mateju <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -40,18 +38,25 @@ msgstr "Vpisati je treba veljaven ključ programa in kodo za Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Napaka nastavljanja shrambe Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Opozorilo:</b> paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče."
 
-#: lib/config.php:426
+#: 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 "<b>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ni mogoče."
+msgstr "<b>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ne bo mogoče."
+
+#: 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 "<b>Opozorilo:</b> podpora za Curl v PHP ni omogočena ali pa ni nameščena. Priklapljanje točke ownCloud / WebDAV ali GoogleDrive zato ne bo mogoče. Zahtevane pakete je treba pred uporabo namestiti."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -104,7 +109,7 @@ msgstr "Izbriši"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr "Omogoči uporabniško zunanjo podatkovno shrambo"
+msgstr "Omogoči zunanjo uporabniško podatkovno shrambo"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index fe6f3a246d3c98ca300c476ae4165ae6a5b9eaf2..0a8734395c408b52814b4b68ed8be1ff3595aef3 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-06 00:04+0200\n"
-"PO-Revision-Date: 2013-04-05 17:50+0000\n"
-"Last-Translator: mateju <>\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"
 "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"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index e84784368baa1329866d24a8197c1540c55815ac..5d5ab4fc15d6ce0cfe6b3ee121535f884cf9f545 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <>, 2013.
-# Matej Urbančič <>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Datoteke %s ni mogoče dokončno izbrisati."
 msgid "Couldn't restore %s"
 msgstr "Ni mogoče obnoviti %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "izvedi opravilo obnavljanja"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Napaka"
 
@@ -41,31 +39,31 @@ msgstr "Napaka"
 msgid "delete file permanently"
 msgstr "dokončno izbriši datoteko"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Izbriši dokončno"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Izbrisano"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} datotek"
 
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 5810bb0297c23ef5433a8bb6b2650360dd867dbc..3ca64dce8f9317be284834e159483d9ddc1b36f1 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-13 00:05+0100\n"
-"PO-Revision-Date: 2013-03-12 14:30+0000\n"
-"Last-Translator: mateju <>\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"
 "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"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index ab2c68775537ce56e311155d7ec384cafbe12d59..093c05c6aa99c5d051cf771ac8ae3f1fd4ea6b16 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-06 00:04+0200\n"
-"PO-Revision-Date: 2013-04-05 17:40+0000\n"
-"Last-Translator: mateju <>\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: 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,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Pomoč"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Osebno"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Uporabniki"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Skrbništvo"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoče prejeti le posamično."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "ni mogoče določiti"
 
@@ -70,7 +67,7 @@ msgstr "Program ni omogočen"
 
 #: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
-msgstr "Napaka overitve"
+msgstr "Napaka pri overjanju"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
@@ -96,10 +93,6 @@ msgstr "Nastavi uporabniško ime skrbnika."
 msgid "Set an admin password."
 msgstr "Nastavi geslo skrbnika."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Določi podatkovno mapo."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Napaka podatkovne zbirke: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Napačni ukaz je: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Napačni ukaz je: \"%s\", ime: %s, geslo: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
@@ -227,7 +224,7 @@ msgstr "pred %d dnevi"
 
 #: template.php:121
 msgid "last month"
-msgstr "prejšnji mesec"
+msgstr "zadnji mesec"
 
 #: template.php:122
 #, php-format
@@ -240,20 +237,7 @@ msgstr "lansko leto"
 
 #: template.php:124
 msgid "years ago"
-msgstr "pred nekaj leti"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s je na voljo. <a href=\"%s\">Več podrobnosti.</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "posodobljeno"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "preverjanje za posodobitve je onemogočeno"
+msgstr "let nazaj"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index fef896bdd84ec6755bb56044003de3e30ddd7300..5fe4dff79e1b283e603e4d37fda0ea92e7a0da94 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <>, 2013.
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-#   <peter.perosa@gmail.com>, 2012.
-# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
-#   <urossolar@hotmail.com>, 2011, 2012.
+# mateju <>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: mateju <>\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"
 "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"
@@ -25,14 +20,18 @@ msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr "Ni mogoče naložiti seznama iz središča App Store"
+msgstr "Ni mogoče naložiti seznama iz programskega središča"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Napaka overitve"
+msgstr "Napaka med overjanjem"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Prikazano ime je bilo spremenjeno."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Prikazanega imena ni mogoče spremeniti."
 
@@ -122,52 +121,52 @@ msgstr "Prišlo je do napake med posodabljanjem programa."
 msgid "Updated"
 msgstr "Posodobljeno"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Uporabnika ni mogoče odstraniti"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Skupine"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "dodaj skupino"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Navedeno mora biti veljavno uporabniško ime"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Napaka ustvarjanja uporabnika"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Navedeno mora biti veljavno geslo"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Slovenščina"
 
@@ -318,19 +317,19 @@ msgstr "Dnevnik"
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -401,7 +400,7 @@ msgstr "Pridobi programe za usklajevanje datotek"
 msgid "Show First Run Wizard again"
 msgstr "Zaženi čarovnika prvega zagona"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Geslo"
 
@@ -425,82 +424,74 @@ msgstr "Novo geslo"
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Prikazano ime"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Prikazano ime je spremenjeno."
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Prikazanega imena ni mogoče spremeniti."
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Spremeni prikazano ime"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Elektronska pošta"
+msgstr "Elektronski naslov"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Prijavno ime"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Ustvari"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Privzeta shramba"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Neomejeno"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Shramba"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "spremeni prikazano ime"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "nastavi novo geslo"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index aaaefb8647c488c6dc4b83220cbb6e776ea4c1a2..c6b3dec4e80cf12fb9e209f370254414da0aaa3d 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <>, 2012.
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: mateju <>\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"
 "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,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Brisanje nastavitev strežnika je spodletelo."
@@ -56,281 +57,363 @@ msgstr "Ali nas se nastavitve ohranijo?"
 msgid "Cannot add server configuration"
 msgstr "Ni mogoče dodati nastavitev strežnika"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Uspešno končano."
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Napaka"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Preizkus povezave je uspešno končan."
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Preizkus povezave je spodletel."
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Potrdi brisanje"
 
-#: templates/settings.php:8
+#: 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 "<b>Opozorilo:</b> možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoče nepričakovano obnašanje sistema. Eno izmed možnosti je priporočeno onemgočiti."
 
-#: templates/settings.php:11
+#: 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 "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Nastavitev strežnika"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Dodaj nastavitve strežnika"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Gostitelj"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Osnovni DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "En osnovni DN na vrstico"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku naprednih možnosti."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Uporabnik DN"
 
-#: templates/settings.php:45
+#: 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 "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Za brezimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter prijav uporabnikov"
 
-#: templates/settings.php:53
+#: 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 "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime v postopku prijave."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter seznama uporabnikov"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Filter skupin"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Nastavitve povezave"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Dejavna nastavitev"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Neizbrana možnost preskoči nastavitev."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Varnostna kopija (replika) podatkov gostitelja"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Varnostna kopija (replika) podatka vrat"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Onemogoči glavni strežnik"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Uporabi TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Strežnika ni priporočljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Onemogoči določanje veljavnosti potrdila SSL."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Predpomni podatke TTL"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Nastavitve mape"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Osnovno uporabniško drevo"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Eno osnovno uporabniško ime DN na vrstico"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Uporabi atribute iskanja"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Izbirno; en atribut na vrstico"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Eno osnovno ime skupine DN na vrstico"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Atributi iskanja skupine"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Povezava član-skupina"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Posebni atributi"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Polje količinske omejitve"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Privzeta količinska omejitev"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Polje elektronske pošte"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Pravila poimenovanja uporabniške osebne mape"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
 
-#: templates/settings.php:99
+#: 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 "Preizkusne nastavitve"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 829fe4d8a16d395963193094598305ff75a90d97..1d6f802d7e014e1b959809fe333da5674f8ad92a 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Matej Urbančič <>, 2013.
-# Peter Peroša <peter.perosa@gmail.com>, 2012-2013.
+# mateju <>, 2013
+# Peter Peroša <peter.perosa@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-10 00:05+0100\n"
-"PO-Revision-Date: 2013-03-09 19:30+0000\n"
-"Last-Translator: mateju <>\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"
 "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"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 66f2ea88ad3e802158f8fcea45019c3479e7223f..4fdc47f3c7748d3529c626b60e37c67b08264d95 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rapid_odeen@zoho.com>, 2013.
+# Odeen <rapid_odeen@zoho.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 13:20+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\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: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,77 +159,81 @@ msgstr "Dhjetor"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Parametrat"
+msgstr "Parametra"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minutë më parë"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuta më parë"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 orë më parë"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} orë më parë"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} ditë më parë"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} muaj më parë"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "muaj më parë"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "vite më parë"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Zgjidh"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Anulo"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Jo"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Po"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Jo"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Në rregull"
 
@@ -294,7 +298,7 @@ msgstr "Nda me lidhje"
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Kodi"
 
@@ -397,24 +401,27 @@ msgstr "Rivendosja e kodit të ownCloud-it"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Përdorni lidhjen në vijim për të rivendosur kodin: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin."
+#: 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 "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj.<br>Nëqoftëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme (spam).<br>Nëqoftëse nuk është as aty, pyesni administratorin tuaj lokal."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Emaili i rivendosjes u dërgua."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i saktë?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Kërkesa dështoi!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Përdoruesi"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Bëj kërkesë për rivendosjen"
 
@@ -520,37 +527,37 @@ msgstr "Të përparuara"
 msgid "Data folder"
 msgstr "Emri i dosjes"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfiguro database-in"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "do të përdoret"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Përdoruesi i database-it"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Kodi i database-it"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Emri i database-it"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Tablespace-i i database-it"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Pozicioni (host) i database-it"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Mbaro setup-in"
 
@@ -558,37 +565,42 @@ msgstr "Mbaro setup-in"
 msgid "web services under your control"
 msgstr "shërbime web nën kontrollin tënd"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Dalje"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Hyrja automatike u refuzua!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Ju lutemi, ndryshoni kodin për ta siguruar përsëri llogarinë tuaj."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Ke humbur kodin?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "kujto"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Hyrje"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index abcbe9a312e82c74598e2ac7d1b170d861ee6145..724c3d496d263d2b0caf8cb63138c4a0f39e1f38 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rapid_odeen@zoho.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:08+0200\n"
-"PO-Revision-Date: 2013-04-10 09:20+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,10 +27,6 @@ msgstr "%s nuk u spostua - Aty ekziston një skedar me të njëjtin emër"
 msgid "Could not move %s"
 msgstr "%s nuk u spostua"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Nuk është i mundur riemërtimi i skedarit"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Nuk u ngarkua asnjë skedar. Veprim i gabuar i panjohur"
@@ -79,55 +74,59 @@ msgstr "Dosje e pavlefshme."
 msgid "Files"
 msgstr "Skedarët"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Nda"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Elimino përfundimisht"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Elimino"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Riemërto"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Pezulluar"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ekziston"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "zëvëndëso"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "sugjero një emër"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "anulo"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "U zëvëndësua {new_name} me {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "anulo"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "ekzekuto operacionin e eliminimit"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Po ngarkohet 1 skedar"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "po ngarkoj skedarët"
 
@@ -153,69 +152,77 @@ msgstr "Hapësira juaj e memorizimit është plot, nuk mund të ngarkoni apo sin
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Hapësira juaj e memorizimit është gati plot ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Shkarkimi juaj po përgatitet. Mund të duhet pak kohë nqse skedarët janë të mëdhenj."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nuk është i mundur ngarkimi i skedarit tuaj sepse është dosje ose ka dimension 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Nuk ka hapësirë memorizimi e mjaftueshme"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anulua."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ngarkimi i skedarit është në vazhdim. Nqse ndërroni faqen tani ngarkimi do të anulohet."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL-i nuk mund të jetë bosh."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dosje"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dosje"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 skedar"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} skedarë"
 
+#: 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 "Nuk është i mundur riemërtimi i skedarit"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Ngarko"
@@ -276,37 +283,37 @@ msgstr "Skedarë të eliminuar"
 msgid "Cancel upload"
 msgstr "Anulo ngarkimin"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Nuk keni të drejta për të shkruar këtu."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Këtu nuk ka asgjë. Ngarkoni diçka!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Ngarkimi është shumë i madh"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skedarët që doni të ngarkoni tejkalojnë dimensionet maksimale për ngarkimet në këtë server."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Skedarët po analizohen, ju lutemi pritni."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Analizimi aktual"
 
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index 4cb262b3e8b4a89bd9e05c12d2b390805f2fed24..bd48080f91fc44b2f22542a5c58f3563352d7ffe 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 5a989cbebc1f50320ba269085c0f95e6ac8320b0..8ce7fabac0f9e9ccfe63f28fac6b1f37ec1897a8 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:424
+#: 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:427
+#: 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 ""
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index ec38c14f36d2542317d9e21e35f564397a592081..4615a7ca8bd7b78139fd7ae48b637359f1b043e8 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rapid_odeen@zoho.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-04 00:05+0200\n"
-"PO-Revision-Date: 2013-04-03 14:00+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index b576868130fd343f7a1b0c72aa48347e7b6c1acf..5a1dfc686ec695cb8f75e5c6c7cab87016300a7d 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/files_trashbin.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rapid_odeen@zoho.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-11 02:08+0200\n"
-"PO-Revision-Date: 2013-04-10 09:00+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +27,11 @@ msgstr "Nuk munda ta eliminoj përfundimisht %s"
 msgid "Couldn't restore %s"
 msgstr "Nuk munda ta rivendos %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "ekzekuto operacionin e rivendosjes"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Veprim i gabuar"
 
@@ -40,31 +39,31 @@ msgstr "Veprim i gabuar"
 msgid "delete file permanently"
 msgstr "eliminoje përfundimisht skedarin"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Elimino përfundimisht"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Emri"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminuar"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 dosje"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} dosje"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 skedar"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} skedarë"
 
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index a5a97e9bdb6a677209577eb364a50aec069c2b21..3c148e4911f7392b54ccc3fdd088bd7c354bba6c 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 2ea2562cf94f8b98e8f09d79f9da4a05933f0530..dc1f8a07956c54f6cf8c575cb95553f6cab89416 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rapid_odeen@zoho.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 13:20+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\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: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Ndihmë"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
-msgstr "Parametrat"
+msgstr "Parametra"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "App"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Skedarët duhet të shkarkohen një nga një."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Kthehu tek skedarët"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Skedarët e selektuar janë shumë të mëdhenj për të krijuar një skedar ZIP."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "nuk u vendos dot"
 
@@ -94,10 +93,6 @@ msgstr "Cakto emrin e administratorit."
 msgid "Set an admin password."
 msgstr "Cakto kodin e administratorit."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Specifiko dosjen e të dhënave."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +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:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 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:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Veprim i gabuar i DB-it: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Komanda e gabuar ishte: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Eliminoni këtë përdorues nga MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Eliminoni këtë përdorues nga MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+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
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, 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:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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>."
@@ -240,19 +239,6 @@ msgstr "vitin e shkuar"
 msgid "years ago"
 msgstr "vite më parë"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s është i disponueshëm. <a href=\"%s\">Informohuni këtu</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "i azhornuar"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "kontrollimi i azhurnimeve është i çaktivizuar"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 9fe3e67ef431d4ecd18ff62c0125d36b474eddcd..ca60e24747551caf597b1f5423f674741ddc7c3d 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <rapid_odeen@zoho.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-13 02:12+0200\n"
-"PO-Revision-Date: 2013-04-12 16:20+0000\n"
-"Last-Translator: Odeen <rapid_odeen@zoho.com>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Veprim i gabuar gjatë vërtetimit të identitetit"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr "anulo"
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Elimino"
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -313,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj"
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Kodi"
 
@@ -420,82 +423,74 @@ msgstr "Kodi i ri"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr ""
+msgstr "Email-i"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index d0436434a5c3b733333d49b4b1bc25cf7fabf1df..0b78efc5c470136224a38d60249bec899627410a 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.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-04-03 00:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Veprim i gabuar"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Kodi"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Ndihmë"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 1324665d52b15a00cac3887dcd62970a668e17a6..2ffc70b6f16aefb4082758144bd725796c1c41e7 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 1d0f0b519370cbe198c977f852b980edc89f6450..ecabb16ba4243ca19083d4dde4324ee71807d56d 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ivan Petrović <ivan@ipplusstudio.com>, 2012-2013.
-#   <marko@evizo.com>, 2012.
-# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -161,77 +158,81 @@ msgstr "Децембар"
 
 #: js/js.js:286
 msgid "Settings"
-msgstr "Подешавања"
+msgstr "Поставке"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "пре 1 минут"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "пре {minutes} минута"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "Пре једног сата"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "Пре {hours} сата (сати)"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "пре {days} дана"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "Пре {months} месеца (месеци)"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "година раније"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Одабери"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Откажи"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Не"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Да"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Не"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "У реду"
 
@@ -262,7 +263,7 @@ msgstr ""
 
 #: js/share.js:90
 msgid "Share"
-msgstr "Дељење"
+msgstr "Дели"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
@@ -296,7 +297,7 @@ msgstr "Подели линк"
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Лозинка"
 
@@ -334,7 +335,7 @@ msgstr "Подељено унутар {item} са {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Не дели"
+msgstr "Укини дељење"
 
 #: js/share.js:320
 msgid "can edit"
@@ -399,24 +400,27 @@ msgstr "Поништавање лозинке за ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Овом везом ресетујте своју лозинку: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "Захтев је послат поштом."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Захтев одбијен!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Добићете везу за ресетовање лозинке путем е-поште."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Корисничко име"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Захтевај ресетовање"
 
@@ -438,7 +442,7 @@ msgstr "Ресетуј лозинку"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Лична"
+msgstr "Лично"
 
 #: strings.php:6
 msgid "Users"
@@ -446,11 +450,11 @@ msgstr "Корисници"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Програми"
+msgstr "Апликације"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Аднинистрација"
+msgstr "Администратор"
 
 #: strings.php:9
 msgid "Help"
@@ -522,37 +526,37 @@ msgstr "Напредно"
 msgid "Data folder"
 msgstr "Фацикла података"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Корисник базе"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Радни простор базе података"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
@@ -560,37 +564,42 @@ msgstr "Заврши подешавање"
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Одјава"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Аутоматска пријава је одбијена!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Ако ускоро не промените лозинку ваш налог може бити компромитован!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Промените лозинку да бисте обезбедили налог."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "упамти"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Пријава"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 779a126355d84803f438e9deb88aeba7267d5818..1137159319524ea60a5312235e1b4e5d60db86e9 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ivan Petrović <ivan@ipplusstudio.com>, 2012.
-# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
-#   <theranchcowboy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,20 +20,16 @@ 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 ""
-
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
+msgstr "Не могу да преместим %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Ниједна датотека није отпремљена услед непознате грешке"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -71,75 +64,79 @@ 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"
 msgstr "Датотеке"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Дели"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Обриши за стално"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "замени"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "предложи назив"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "откажи"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "обриши"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "Отпремам 1 датотеку"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "датотеке се отпремају"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "Датотека „.“ је неисправног имена."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Име датотеке не може бити празно."
 
 #: js/files.js:64
 msgid ""
@@ -149,75 +146,83 @@ msgstr "Неисправан назив. Следећи знакови нису
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване."
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не могу да отпремим датотеку као фасциклу или она има 0 бајтова"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Нема довољно простора"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "Адреса не може бити празна."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Назив"
+msgstr "Име"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
+#: 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 "Отпреми"
@@ -272,46 +277,46 @@ msgstr "Са везе"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Обрисане датотеке"
 
 #: templates/index.php:48
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Овде немате дозволу за писање."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Дограђујем кеш система датотека…"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 4f38bb711f920edeb8ec52ab355e7f830ebcc6a3..1c2c46e27c3f4ab431fc961cb386c26cc82c7f70 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <marko@evizo.com>, 2012.
-#   <theranchcowboy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Чување у току..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ништа"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index f9dec54fe8b2e11961a8d4f6972bb4f641546e46..03af7666c7551501b03d91a03258735800743696 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index d2e787a42cddc76c281c99a06c24ccb52d06ded8..a24d938a0bb9283d8f949b4e7a5d9e03bcecec77 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-02-07 00:07+0100\n"
-"PO-Revision-Date: 2013-02-06 17:30+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,24 +25,24 @@ msgstr "Лозинка"
 msgid "Submit"
 msgstr "Пошаљи"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr ""
+msgstr "веб сервиси под контролом"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index d187778db8165382ee857d8bd4e127763a0b8381..35c72b956b58f66b7927a772ace3909f15050a05 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <theranchcowboy@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "врати у претходно стање"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Грешка"
 
@@ -40,31 +39,31 @@ msgstr "Грешка"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "Обриши за стално"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Име"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 402e0c7165b11e81e1874dfd78a3bb67445f74e8..74cb70e53d311356956b56f207470bb4905624f6 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <theranchcowboy@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -41,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index bda81308e9160546e761d126094df2d0257adc57..8a29b2b437f7e7884d2dad87b415d1aed66bb159 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ivan Petrović <ivan@ipplusstudio.com>, 2012-2013.
-#  <theranchcowboy@gmail.com>, 2013.
-#   <theranchcowboy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Помоћ"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Поставке"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Апликације"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Администратор"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Преузимање ZIP-а је искључено."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Датотеке морате преузимати једну по једну."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Назад на датотеке"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Изабране датотеке су превелике да бисте направили ZIP датотеку."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "није одређено"
 
@@ -96,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,75 +113,79 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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"
@@ -205,7 +202,7 @@ msgstr "пре %d минута"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr "пре 1 сат"
+msgstr "Пре једног сата"
 
 #: template.php:117
 #, php-format
@@ -242,19 +239,6 @@ msgstr "прошле године"
 msgid "years ago"
 msgstr "година раније"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s је доступна. Погледајте <a href=\"%s\">више информација</a>."
-
-#: updater.php:81
-msgid "up to date"
-msgstr "је ажурна"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "провера ажурирања је онемогућена"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index c6dcf5bad7fc006041efea57493641bfb780c704..cb20f885bf10bd643670fa7665208c0cb8997737 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <marko@evizo.com>, 2012.
-# Slobodan Terzić <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,15 +21,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Грешка приликом учитавања списка из Складишта Програма"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Грешка при аутентификацији"
+msgstr "Грешка при провери идентитета"
 
-#: ajax/changedisplayname.php:32
-msgid "Unable to change display name"
+#: 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 "Група већ постоји"
@@ -84,11 +86,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"
@@ -96,11 +98,11 @@ msgstr "Искључи"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Укључи"
+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"
@@ -108,62 +110,62 @@ 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:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Чување у току..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "обрисано"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "опозови"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Не могу да уклоним корисника"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Групе"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Управник групе"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "додај групу"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Морате унети исправно корисничко име"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "Грешка при прављењу корисника"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Морате унети исправну лозинку"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -182,32 +184,32 @@ 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 ""
 "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
@@ -219,7 +221,7 @@ msgstr ""
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Веза с интернетом не ради"
 
 #: templates/admin.php:78
 msgid ""
@@ -237,7 +239,7 @@ msgstr ""
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Изврши један задатак са сваком учитаном страницом"
 
 #: templates/admin.php:111
 msgid ""
@@ -253,52 +255,52 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Дељење"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Омогући API Share"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Дозвољава апликацијама да користе API Share"
 
 #: 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 ""
@@ -308,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Бележење"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Ниво бележења"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
-msgstr ""
+msgstr "Више"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
-msgstr ""
+msgstr "Мање"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
-msgstr ""
+msgstr "Верзија"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -362,27 +364,27 @@ msgstr "Ажурирај"
 
 #: templates/help.php:4
 msgid "User Documentation"
-msgstr ""
+msgstr "Корисничка документација"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "Администраторска документација"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "Мрежна документација"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "Форум"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Праћење грешака"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr ""
+msgstr "Комерцијална подршка"
 
 #: templates/personal.php:8
 #, php-format
@@ -391,13 +393,13 @@ msgstr "Искористили сте <strong>%s</strong> од дозвољен
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr ""
+msgstr "Преузмите апликације ради синхронизовања датотека"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "Поново прикажи чаробњак за прво покретање"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Лозинка"
 
@@ -421,82 +423,74 @@ msgstr "Нова лозинка"
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
-msgstr ""
-
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
+msgstr "Име за приказ"
 
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ун"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Користите ову адресу да се повежете са ownCloud-ом у управљачу датотекама"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
-msgstr ""
+msgstr "Корисничко име"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Направи"
 
-#: templates/users.php:35
-msgid "Default Storage"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr "Подразумевано складиште"
+
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
-msgstr ""
+msgstr "Неограничено"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Друго"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
-msgstr ""
+msgstr "Складиште"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
-msgstr ""
+msgstr "промени име за приказ"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
-msgstr ""
+msgstr "постави нову лозинку"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
-msgstr ""
+msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index cf42fd657318433e2d8c85035e4dc0a309b5ca62..830588c67a3a24cc61a9cedb0590bfa7d128364d 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <theranchcowboy@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Домаћин"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://."
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "База DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Корисник DN"
 
-#: templates/settings.php:45
+#: 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 "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "За анониман приступ, оставите поља DN и лозинка празним."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Филтер за пријаву корисника"
 
-#: templates/settings.php:53
+#: 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 "Одређује филтер за примењивање при покушају пријаве. %%uid замењује корисничко име."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "користите чувар места %%uid, нпр. „uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Филтер за списак корисника"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Одређује филтер за примењивање при прибављању корисника."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без икаквог чувара места, нпр. „objectClass=person“."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Филтер групе"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Одређује филтер за примењивање при прибављању група."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без икаквог чувара места, нпр. „objectClass=posixGroup“."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Користи TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP сервер осетљив на велика и мала слова (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Искључите потврду SSL сертификата."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Увезите SSL сертификат LDAP сервера у свој ownCloud ако веза ради само са овом опцијом."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Не препоручује се; користите само за тестирање."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "у секундама. Промена испражњава кеш меморију."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Име приказа корисника"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP атрибут за стварање имена ownCloud-а корисника."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Основно стабло корисника"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Име приказа групе"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP атрибут за стварање имена ownCloud-а групе."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Основна стабло група"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Придруживање чланова у групу"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Помоћ"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 764d45ef4080787a054b1ebfebca12c64df88417..30b3f69adc1f96ce8b6003cdea9595a0b86b0554 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <theranchcowboy@gmail.com>, 2013.
+# Rancher <theranchcowboy@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-03 00:04+0100\n"
-"PO-Revision-Date: 2013-02-02 22:10+0000\n"
-"Last-Translator: Rancher <theranchcowboy@gmail.com>\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "WebDAV провера идентитета"
 msgid "URL: http://"
 msgstr "Адреса: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 44ec0fad2ab2d6175112ee5f6951ae7c1dc20deb..578a7fd08e9db7247769c5265bfe27f79f62b15a 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:12+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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr "Decembar"
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -238,8 +241,10 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:577
+#: 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 ""
@@ -292,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lozinka"
 
@@ -395,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Zahtevaj resetovanje"
 
@@ -434,7 +442,7 @@ msgstr "Resetuj lozinku"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "Lična"
+msgstr "Lično"
 
 #: strings.php:6
 msgid "Users"
@@ -518,37 +526,37 @@ msgstr "Napredno"
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "će biti korišćen"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
@@ -556,37 +564,42 @@ msgstr "Završi podešavanje"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Odjava"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "upamti"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index d28e72bf26050f7f9232fa294e188ba344f526e9..5e2fce754bd69f461892e151fcf973197ceceaf7 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -79,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Pošalji"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index a34c90f6c0de4dcc6d561c436af8fbebdf0cb94e..b5ee53a5544eef86b7b5a0c4766b949a43be87ff 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index ccf11b6140c1cdc77776b000a8cb0c7a28b2c535..6a60f8db63d18d668761b37a8439d90b0b2ff532 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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index cd27899cfcbfc461492819397f884a56fc9aa3bb..5e3e65bfa29f1257b6a4bdf1a254cc3a8338609b 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,30 +19,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Lozinka"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Pošalji"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
-msgstr ""
+msgstr "Preuzmi"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: 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 51104cc42d86d7309fae44c53f16e89dcdfa25e4..4801956125200a2605172302d47db38de739efa8 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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr ""
 
@@ -39,31 +39,31 @@ msgstr ""
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Ime"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 53af96aaac6e7066b540a4a3aed4cba5cca1027d..ccd4cfed296b5484159016335baa30c0d5f068e1 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 5af0bde8e2fb5bcb7bf4233f1054480986b325b7..efdd4a310ac8929fa1b77cf22459953edf5fa836 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-03-31 22:13+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: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Lično"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
-msgstr ""
+msgstr "Programi"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Adninistracija"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index d7de36047b7a58992aa25be98b9c7d83c2449df9..c9f8cd90bec616d50b67ed1df60d5edce730e60c 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Slobodan Terzić <githzerai06@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Greška pri autentifikaciji"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -101,6 +104,10 @@ msgstr ""
 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 ""
@@ -109,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -313,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Lozinka"
 
@@ -420,82 +423,74 @@ msgstr "Nova lozinka"
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Napravi"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 05f0229b2ed08f15b2e965c1b2eb84a3a06ab4e8..fa87c1da98e9197cae156f57404edfe20a763157 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
-msgstr ""
+msgstr "Lozinka"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Pomoć"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 246116723c6910e7a2517f1316fa74d89d36cfd0..8a2eb941c19457633990317082a2438247fda32f 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index cc1e60450c1b8766cf52b52e1b6aba73e71e0674..0f557990e1709c7409d5cbcd5f76db91ad778ab7 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,20 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André <lokal_profil@hotmail.com>, 2013.
-# Christer Eriksson <post@hc3web.com>, 2012.
-# Daniel Sandman <revoltism@gmail.com>, 2012.
-#   <hakan.thn@gmail.com>, 2011.
-# Magnus Höglund <magnus@linux.com>, 2012-2013.
-#   <magnus@linux.com>, 2012.
-#   <revoltism@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,75 +160,79 @@ msgstr "December"
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} månader sedan"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Välj"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Nej"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Nej"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -300,7 +297,7 @@ msgstr "Delad med länk"
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Lösenord"
 
@@ -403,24 +400,27 @@ msgstr "ownCloud lösenordsåterställning"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Använd följande länk för att återställa lösenordet: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Du får en länk att återställa ditt lösenord via e-post."
+#: 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:5
-msgid "Reset email send."
-msgstr "Återställ skickad e-post."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Begäran misslyckades!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Du får en länk att återställa ditt lösenord via e-post."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Användarnamn"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Begär återställning"
 
@@ -470,7 +470,7 @@ msgstr "Hittade inget moln"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Redigera kategorier"
+msgstr "Editera kategorier"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -520,43 +520,43 @@ msgstr "Skapa ett <strong>administratörskonto</strong>"
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "Avancerat"
+msgstr "Avancerad"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "kommer att användas"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Databas tabellutrymme"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
@@ -564,37 +564,42 @@ msgstr "Avsluta installation"
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Logga ut"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Automatisk inloggning inte tillåten!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Ändra genast lösenord för att säkra ditt konto."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "kom ihåg"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Logga in"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 4ba1e2732850a6980c4d1b28601350b2f95db7f0..309717a6ab5061895dedbcc216e1f87bc257905a 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,19 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André <lokal_profil@hotmail.com>, 2013.
-# Christer Eriksson <post@hc3web.com>, 2012.
-# Daniel Sandman <revoltism@gmail.com>, 2012.
-# Magnus Höglund <magnus@linux.com>, 2012-2013.
-#   <magnus@linux.com>, 2012.
-#   <revoltism@gmail.com>, 2011, 2012.
-#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -34,17 +27,13 @@ msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
 msgid "Could not move %s"
 msgstr "Kan inte flytta %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Kan inte byta namn på filen"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Inga fel uppstod. Filen laddades upp utan problem"
+msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
 #: ajax/upload.php:27
 msgid ""
@@ -55,7 +44,7 @@ msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Den uppladdade filen överstiger MAX_FILE_SIZE direktivet som anges i HTML-formulär"
+msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
@@ -63,11 +52,11 @@ msgstr "Den uppladdade filen var endast delvis uppladdad"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Ingen fil blev uppladdad"
+msgstr "Ingen fil laddades upp"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Saknar en tillfällig mapp"
+msgstr "En temporär mapp saknas"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -85,57 +74,61 @@ msgstr "Felaktig mapp."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Dela"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Radera"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "utför raderingen"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "filer laddas upp"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -159,69 +152,77 @@ msgstr "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller sy
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
+msgstr "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Inte tillräckligt med utrymme tillgängligt"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Fel"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: 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 "Kan inte byta namn på filen"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Ladda upp"
@@ -282,37 +283,37 @@ msgstr "Raderade filer"
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Du saknar skrivbehörighet här."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Aktuell skanning"
 
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index b401db609de32d1be23dd421e1b4f90b92d7ebbb..b6c142e6e098f0b7df64e54203e7365cf32014c7 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André <lokal_profil@hotmail.com>, 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Sparar..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Filkryptering är aktiverat."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Följande filtyper kommer inte att krypteras:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Exkludera följande filtyper från kryptering:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Ingen"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index e5cb8e70b64612be8e9e6d6e95d19705504937ee..1a259e127a9dde911fc9f6c394724cfba4551d84 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André <lokal_profil@hotmail.com>, 2013.
-# Magnus Höglund <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Lokal_Profil <lokal_profil@hotmail.com>\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"
 "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"
@@ -39,19 +37,26 @@ msgstr "Ange en giltig Dropbox nyckel och hemlighet."
 msgid "Error configuring Google Drive storage"
 msgstr "Fel vid konfigurering av Google Drive"
 
-#: lib/config.php:423
+#: 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 "<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."
 
-#: lib/config.php:426
+#: 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 "<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."
 
+#: 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 "Extern lagring"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 8b3fffa739269256aa88879dba82348010011bc1..1167bb13e25a90803865d4b21731d04d45f472e0 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus Höglund <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 11:37+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "Lösenord"
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s delade mappen %s med dig"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s delade filen %s med dig"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ingen förhandsgranskning tillgänglig för"
 
-#: templates/public.php:37
+#: 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 4215aa66abbd2813ab0800a6206ddc0a9b53bce9..bd5cf20c8bef2a940a50ddda2dff3b56f1584a24 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André <lokal_profil@hotmail.com>, 2013.
-# Magnus Höglund <magnus@linux.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "Kunde inte radera %s permanent"
 msgid "Couldn't restore %s"
 msgstr "Kunde inte återställa %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "utför återställning"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Fel"
 
@@ -41,31 +39,31 @@ msgstr "Fel"
 msgid "delete file permanently"
 msgstr "radera filen permanent"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Namn"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Raderad"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 7570670aefe290423f70879c710f1af6c9bd2daa..0448134617cd23efdcf1c2794885def1a20c542d 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-04-01 08:30+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index da947e167c7f04d191dd8c8d9a092de979b23a4d..a0e329698d54b4d93e89015a1c00fb6dd477b499 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus Höglund <magnus@linux.com>, 2012-2013.
-#   <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,47 +17,47 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Hjälp"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Inställningar"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Användare"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP är avstängd."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer är för stora för att skapa zip-fil."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "kunde inte bestämmas"
 
@@ -95,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -119,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
@@ -213,11 +211,11 @@ msgstr "%d timmar sedan"
 
 #: template.php:118
 msgid "today"
-msgstr "idag"
+msgstr "i dag"
 
 #: template.php:119
 msgid "yesterday"
-msgstr "igår"
+msgstr "i går"
 
 #: template.php:120
 #, php-format
@@ -241,19 +239,6 @@ msgstr "förra året"
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s finns. FÃ¥ <a href=\"%s\">mer information</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "uppdaterad"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "uppdateringskontroll är inaktiverad"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index e5846829b2887ab22b8ffe0e01cc046c084a5606..7df94e6cf6145da515d8981870b7c9b17980ccff 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,22 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André <lokal_profil@hotmail.com>, 2013.
-# Christer Eriksson <post@hc3web.com>, 2012.
-# Daniel Sandman <revoltism@gmail.com>, 2012.
-#   <hakan.thn@gmail.com>, 2011.
-# Magnus Höglund <magnus@linux.com>, 2012-2013.
-#   <magnus@linux.com>, 2012.
-#   <q@xnq.me>, 2012.
-#   <revoltism@gmail.com>, 2011, 2012.
-#   <tscooter@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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"
@@ -30,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Kan inte ladda listan från App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "Autentiseringsfel"
+msgstr "Fel vid autentisering"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Kan inte ändra visningsnamn"
 
@@ -125,52 +120,52 @@ msgstr "Fel uppstod vid uppdatering av appen"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "raderad"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kan inte ta bort användare"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Gruppadministratör"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Radera"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "lägg till grupp"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Ett giltigt användarnamn måste anges"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Fel vid skapande av användare"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Ett giltigt lösenord måste anges"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -240,23 +235,23 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Exekvera en uppgift vid varje sidladdning"
 
 #: 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 är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP."
 
 #: 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 "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut."
 
 #: templates/admin.php:128
 msgid "Sharing"
@@ -264,11 +259,11 @@ msgstr "Dela"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktivera delat API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillåt applikationer att använda delat API"
 
 #: templates/admin.php:142
 msgid "Allow links"
@@ -276,7 +271,7 @@ msgstr "Tillåt länkar"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillåt delning till allmänheten via publika länkar"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
@@ -319,21 +314,21 @@ msgstr "Logg"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Nivå på loggning"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -404,7 +399,7 @@ msgstr "Skaffa appar för att synkronisera dina filer"
 msgid "Show First Run Wizard again"
 msgstr "Visa Första uppstarts-guiden igen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Lösenord"
 
@@ -428,82 +423,74 @@ msgstr "Nytt lösenord"
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Visat namn"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Ditt visningsnamn har ändrats"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Kan inte ändra ditt visningsnamn"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Ändra visningsnamn"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Inloggningsnamn"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Förvald lagring"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Obegränsad"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "ändra visat namn"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "ange nytt lösenord"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index cec721691d7ef9a031e2733f255ba193fc9024c5..801f38e6f451e2a16dc66fccba8f4b6ae1ef27b3 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@danielholm.se>, 2013.
-# André <lokal_profil@hotmail.com>, 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-04-02 00:03+0200\n"
-"PO-Revision-Date: 2013-04-01 08:20+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Misslyckades med att radera serverinställningen"
@@ -56,281 +57,363 @@ msgstr "Behåll inställningarna?"
 msgid "Cannot add server configuration"
 msgstr "Kunde inte lägga till serverinställning"
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Lyckat"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Fel"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Anslutningstestet lyckades"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Anslutningstestet misslyckades"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Bekräfta radering"
 
-#: templates/settings.php:8
+#: 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 "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom."
 
-#: templates/settings.php:11
+#: 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 "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Serverinställning"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Lägg till serverinställning"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Server"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Start DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Ett Start DN per rad"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Användare DN"
 
-#: templates/settings.php:45
+#: 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 "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Filter logga in användare"
 
-#: templates/settings.php:53
+#: 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 "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Filter lista användare"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definierar filter att tillämpa vid listning av användare."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "utan platshållare, t.ex. \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Gruppfilter"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definierar filter att tillämpa vid listning av grupper."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Uppkopplingsinställningar"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Konfiguration aktiv"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Säkerhetskopierings-värd (Replika)"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Säkerhetskopierins-port (Replika)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Inaktivera huvudserver"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Använd TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Använd inte för LDAPS-anslutningar, det kommer inte att fungera."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Stäng av verifiering av SSL-certifikat."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Rekommenderas inte, använd bara för test. "
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Cache Time-To-Live"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Mappinställningar"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Attribut för användarnamn"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Attribut som används för att generera användarnamn i ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Bas för användare i katalogtjänst"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "En Användare start DN per rad"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Användarsökningsattribut"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Valfritt; ett attribut per rad"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Attribut för gruppnamn"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Attribut som används för att generera gruppnamn i ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Bas för grupper i katalogtjänst"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "En Grupp start DN per rad"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Gruppsökningsattribut"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Attribut för gruppmedlemmar"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Specialattribut"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Kvotfält"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Datakvot standard"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "E-postfält"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Namnregel för hemkatalog"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
 
-#: templates/settings.php:99
+#: 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 "Testa konfigurationen"
 
-#: templates/settings.php:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index 98475a8bd9775afb679e26b017dc40cc6af859f8..ec341c54811f9aa9daaafe6e76d40421827fbc25 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus Höglund <magnus@linux.com>, 2012-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-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-21 15:25+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\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"
 "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"
@@ -26,7 +26,7 @@ msgstr "WebDAV Autentisering"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index f5cc1f2d3e816dd344e35af31737dc12fa3a9fb4..ee5e620265e4c695f286e592c152102846096632 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-03-22 00:03+0100\n"
-"PO-Revision-Date: 2013-03-21 23:03+0000\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -160,75 +160,79 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:779
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:780
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:781
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:782
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:783
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:784
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:785
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:786
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:787
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:788
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:789
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:790
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:791
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:121
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:162
-msgid "No"
+#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:161
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:168
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:181
 msgid "Ok"
 msgstr ""
 
@@ -237,9 +241,11 @@ msgstr ""
 msgid "The object type is not specified."
 msgstr ""
 
-#: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:136 js/share.js:143 js/share.js:566
-#: js/share.js:578
+#: 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 ""
 
@@ -259,7 +265,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:125 js/share.js:606
+#: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
 msgstr ""
 
@@ -291,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -319,59 +325,59 @@ msgstr ""
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:251
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:276
+#: js/share.js:287
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:308
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:320
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:311
+#: js/share.js:322
 msgid "access control"
 msgstr ""
 
-#: js/share.js:314
+#: js/share.js:325
 msgid "create"
 msgstr ""
 
-#: js/share.js:317
+#: js/share.js:328
 msgid "update"
 msgstr ""
 
-#: js/share.js:320
+#: js/share.js:331
 msgid "delete"
 msgstr ""
 
-#: js/share.js:323
+#: js/share.js:334
 msgid "share"
 msgstr ""
 
-#: js/share.js:357 js/share.js:553
+#: js/share.js:368 js/share.js:564
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:577
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:578
+#: js/share.js:589
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:593
+#: js/share.js:604
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:604
+#: js/share.js:615
 msgid "Email sent"
 msgstr ""
 
@@ -394,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -517,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -555,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:36
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:61
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 65f750efc7e5987c9ff45924eb1300d0947f8125..838ddc4ca6120b8af3d3b0b1de067986f88565f2 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 210f1a0455645b7515be7ff18031addc99970243..181a2ef29a7becbe075aefd8f67be2ce1975bb4d 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-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 2054bbb707ea136765c9be0ed94706f9035c26c9..7958c592cffe29d5de919f718ed0ab044f064d28 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index adbbc6c0f0372246d89a9c61496fd821843c15ad..486d565277c4b30b73f480ce4a037eb8a2e31cd4 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,24 +25,24 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:35
+#: templates/public.php:50
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index 2b45347348cb4e71096f2f2e6f2787e31c4c989d..d76092bcb49df3a9993a198df54f041abdca65b9 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/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-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-08 00:13+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
diff --git a/l10n/sw_KE/files_versions.po b/l10n/sw_KE/files_versions.po
index e8849bf702f65f5b2e7f5ac1b674532c6f511af9..93654e24af738a94d7a9f8121e4250a63f0a3729 100644
--- a/l10n/sw_KE/files_versions.po
+++ b/l10n/sw_KE/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 8dbccab4ab36d5bb8ec611f227c5ebd7cd75728f..1b46612b1c1220fa437778f82abebb142724c988 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/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-02-27 14:35+0100\n"
-"PO-Revision-Date: 2013-02-27 13:36+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:202
+#: files.php:207
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:203
+#: files.php:208
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:204 files.php:231
+#: files.php:209 files.php:242
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:228
+#: files.php:239
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:128 setup.php:320 setup.php:365
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:129 setup.php:152 setup.php:229
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:151 setup.php:453 setup.php:520
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:228
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:282 setup.php:386 setup.php:395 setup.php:413 setup.php:423
-#: setup.php:432 setup.php:461 setup.php:527 setup.php:553 setup.php:560
-#: setup.php:571 setup.php:578 setup.php:587 setup.php:595 setup.php:604
-#: setup.php:610
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:283 setup.php:387 setup.php:396 setup.php:414 setup.php:424
-#: setup.php:433 setup.php:462 setup.php:528 setup.php:554 setup.php:561
-#: setup.php:572 setup.php:588 setup.php:596 setup.php:605
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:299
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:300
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:305
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:306
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:579 setup.php:611
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:631
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:849
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:850
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index a4e6f450aa2023925894edbee0c7ea452ebded65..a8fd5f1a2c26f0715fd0f162e4bc10ab66420211 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:02+0200\n"
+"PO-Revision-Date: 2013-05-25 00:02+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -100,6 +104,10 @@ msgstr ""
 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 ""
@@ -108,60 +116,56 @@ msgstr ""
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:93
-msgid "Error"
-msgstr ""
-
 #: js/apps.js:96
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:105
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:108
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:68
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:70
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:71
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:77 templates/personal.php:78
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:89
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:94
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:96
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 4715c3b41d2d7bd65ba767488d155f233dc07e0c..14bfbf0acb2cf8baac6026ca9be43b84233d1581 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/sw_KE/user_webdavauth.po b/l10n/sw_KE/user_webdavauth.po
index 1e07c21030d991e6bcd4a4fc19e8f3b6a9b084da..b41a7fe5abf1ffbefb9edfeadcb7aab14c7b2972 100644
--- a/l10n/sw_KE/user_webdavauth.po
+++ b/l10n/sw_KE/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-02-08 00:10+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 545101af6a951f27a847c5085e5309192beb2861..cc56a5ad526bbeb69de82ace1777d8a8c3219f6e 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <sgrupan@gmail.com>, 2013.
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -162,75 +160,79 @@ msgstr "மார்கழி"
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "தெரிவுசெய்க "
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "இரத்து செய்க"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "இல்லை"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "ஆம்"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "இல்லை"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "சரி"
 
@@ -295,7 +297,7 @@ msgstr "இணைப்புடன் பகிர்தல்"
 msgid "Password protect"
 msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
@@ -333,7 +335,7 @@ msgstr "{பயனாளர்} உடன் {உருப்படி} பக
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "பகிரமுடியாது"
+msgstr "பகிரப்படாதது"
 
 #: js/share.js:320
 msgid "can edit"
@@ -345,7 +347,7 @@ msgstr "கட்டுப்பாடான அணுகல்"
 
 #: js/share.js:325
 msgid "create"
-msgstr "படைத்தல்"
+msgstr "உருவவாக்கல்"
 
 #: js/share.js:328
 msgid "update"
@@ -398,24 +400,27 @@ msgstr "ownCloud இன் கடவுச்சொல் மீளமைப்
 msgid "Use the following link to reset your password: {link}"
 msgstr "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "மின்னுஞ்சல் அனுப்புதலை மீளமைக்குக"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "வேண்டுகோள் தோல்வியுற்றது!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். "
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "கோரிக்கை மீளமைப்பு"
 
@@ -441,15 +446,15 @@ msgstr "தனிப்பட்ட"
 
 #: strings.php:6
 msgid "Users"
-msgstr "பயனாளர்கள்"
+msgstr "பயனாளர்"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "பயன்பாடுகள்"
+msgstr "செயலிகள்"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "நிர்வாகி"
+msgstr "நிர்வாகம்"
 
 #: strings.php:9
 msgid "Help"
@@ -515,81 +520,86 @@ msgstr "<strong> நிர்வாக கணக்கொன்றை </strong>
 
 #: templates/installation.php:62
 msgid "Advanced"
-msgstr "மேம்பட்ட"
+msgstr "உயர்ந்த"
 
 #: templates/installation.php:64
 msgid "Data folder"
 msgstr "தரவு கோப்புறை"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "தரவுத்தளத்தை தகவமைக்க"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "தரவுத்தள பயனாளர்"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "தரவுத்தள கடவுச்சொல்"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "தரவுத்தள பெயர்"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "தரவுத்தள அட்டவணை"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "தரவுத்தள ஓம்புனர்"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்"
+msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "உங்களுடைய கடவுச்சொல்லை அண்மையில் மாற்றவில்லையின், உங்களுடைய கணக்கு சமரசமாகிவிடும்!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "ஞாபகப்படுத்துக"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "புகுபதிகை"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 615b1ae5ce6024c55c1fb0f4b0efd6d38116f218..84c0f1c55847e381dacade1a4b3127ed52501032 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
@@ -79,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "கோப்புகள்"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "பகிர்வு"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
-msgstr "அழிக்க"
+msgstr "நீக்குக"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "மாற்றிடுக"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "பெயரை பரிந்துரைக்க"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "இரத்து செய்க"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 கோப்பு பதிவேற்றப்படுகிறது"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL  வெறுமையாக இருக்கமுடியாது."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "வழு"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "பதிவேற்றுக"
@@ -250,7 +257,7 @@ msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடி
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr "சேமிக்க"
+msgstr "சேமிக்க "
 
 #: templates/index.php:7
 msgid "New"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
 
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index fbd878dfe562d7f0eb6e7d1f81782581bc6c2ef1..48fb2ff2275a2bac18f4e26b39b37c7bf76cb053 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "சேமிக்கப்படுகிறது..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "மறைக்குறியீடு"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "ஒன்றுமில்லை"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 200c2bbb18d28114f038bf632b8f72c9a2f19293..ee9a204685d0b829ecaf3c4885eead0a43f4a329 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +37,26 @@ msgstr "தயவுசெய்து ஒரு செல்லுபடிய
 msgid "Error configuring Google Drive storage"
 msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
 
-#: lib/config.php:423
+#: 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:426
+#: 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 "வெளி சேமிப்பு"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index cdb761631d352eedcdc7a1fbde831a995e69693e..68673ba7d68d7c60ec9248fe6984e2ec21676e4a 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 09:00+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,24 +25,24 @@ msgstr "கடவுச்சொல்"
 msgid "Submit"
 msgstr "சமர்ப்பிக்குக"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s கோப்புறையானது %s உடன் பகிரப்பட்டது"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
 
-#: templates/public.php:35
+#: 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 0e5ba275f202506d449c13c8df03abb661120924..d6637a6e81c5beeffb8d0a703726d57e9ea89e05 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "வழு"
 
@@ -39,31 +39,31 @@ msgstr "வழு"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index abba80ba96bab168fa667c4ba2ff1dad52541fd8..7fbbf568c95b9ce8d5ccaf3ccb938f1c42ff1329 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +40,17 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 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"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 0a55ae9ad64a177873815afe4819007a7df0b83e..f905e0d67c9e895f5c10411dddcf7232544ec6eb 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "உதவி"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "தனிப்பட்ட"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
-msgstr "பயனாளர்கள்"
+msgstr "பயனாளர்"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "செயலிகள்"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "கோப்புகளுக்கு செல்க"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "வீ சொலிக் கோப்புகளை உருவாக்குவதற்கு தெரிவுசெய்யப்பட்ட கோப்புகள் மிகப்பெரியவை"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -240,19 +239,6 @@ msgstr "கடந்த வருடம்"
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s இன்னும் இருக்கின்றன. <a href=\"%s\">மேலதிக தகவல்களுக்கு</a> எடுக்க"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "நவீன"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "இற்றைப்படுத்தலை சரிபார்ப்பதை செயலற்றதாக்குக"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 23da61ca182da1bc3fbd7cc4e6d94c44f1b797ca..b10ecfa38b7f838e7773dea75731e963afe2b6cf 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "அத்தாட்சிப்படுத்தலில் வழு"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -95,7 +98,7 @@ msgstr "இயலுமைப்ப"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "செயலற்றதாக்குக"
+msgstr "இயலுமைப்படுத்துக"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "இயலுமைப்படுத்துக"
+msgstr "சேமிக்கப்படுகிறது..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "குழு நிர்வாகி"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
-msgstr "அழிக்க"
+msgstr "நீக்குக"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "_மொழி_பெயர்_"
 
@@ -313,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "குறைவான"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
@@ -420,82 +423,74 @@ msgstr "புதிய கடவுச்சொல்"
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்றுக"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "மின்னஞ்சல்"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "மொழி"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "மொழிபெயர்க்க உதவி"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "உருவாக்குக"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "மற்றவை"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index ed69b01b568fcf288a70111e4b74aa2cad9da97f..c1e4d13f30cf844bb26b2bc013b6e9be612628ad 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "ஓம்புனர்"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "தள DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "பயனாளர்  DN"
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "துறை "
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS ஐ பயன்படுத்தவும்"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "தள பயனாளர் மரம்"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "குழுவின் காட்சி பெயர் புலம் "
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "தள குழு மரம்"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "குழு உறுப்பினர் சங்கம்"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "உதவி"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index 59edf0b378ace0457003d6a5442462b87a1702cf..fa5d31237c3420d1cd62a0bfb56bd9eb9752ec82 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suganthi@nic.lk>, 2012.
+# suganthi <suganthi@nic.lk>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/te/core.po b/l10n/te/core.po
index ec30ff10867adcefeffe2238a17b5d7d2629feec..b4228cab2ea207b3a365bc7d9a8ae8e8d6ff3435 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# వీవెన్ <veeven@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: వీవెన్ <veeven@gmail.com>\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: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,75 +160,79 @@ msgstr "డిసెంబర్"
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 నిమిషం క్రితం"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} నిమిషాల క్రితం"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 గంట క్రితం"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} గంటల క్రితం"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} రోజుల క్రితం"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} నెలల క్రితం"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "నెలల క్రితం"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "కాదు"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "అవును"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "కాదు"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "సరే"
 
@@ -294,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -397,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "వాడుకరి పేరు"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -520,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -558,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "మీ సంకేతపదం పోయిందా?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 5a869684be6cae3fce2e33e0a48de4280d4e56a8..ed5e2b98335cecfbbaa1e1ffc6e6ccf0878f3dcd 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# వీవెన్ <veeven@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -79,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "రద్దుచేయి"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index 4490c006c8294d433754f88324a9dcb682a8b92d..7ccbc51637f86133be83108c69dad1b676b31002 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 443334d1537a744cfa27c2a5b378e3854173d6b8..41448bed38d004b828099bc705d4a464d97961d5 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index fbc5e47d934f619254cef490c3d6ec1a144483d6..96195fcf7adb60d7a9785ee69b7ea37f93cef09c 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index db028a5f733bfd781a8c87828455665abae79c0a..5511f5b83a7f47b9e674855c12e8df2f029134b2 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "పొరపాటు"
 
@@ -39,31 +39,31 @@ msgstr "పొరపాటు"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "పేరు"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/te/files_versions.po b/l10n/te/files_versions.po
index 5f1b874d45053b470b13c89eaf30f9802eaa02a6..b745dfb02003ef9f6315c58d0612d52d200b58b1 100644
--- a/l10n/te/files_versions.po
+++ b/l10n/te/files_versions.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index dc5288920b4a8265ee3fb0ef5802444c7d7bc302..9e00af994bbc07b718e37244125b85679d333b90 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "సహాయం"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr "పోయిన సంవత్సరం"
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 932912ae69a2fcbe1f059d51ee370d904eef7595..59f9d4b82e9b66d40dd24247ac438ad741b9e3d8 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# వీవెన్ <veeven@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -22,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -117,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -313,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "మరిన్ని"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -396,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -420,82 +423,74 @@ msgstr "కొత్త సంకేతపదం"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "మీ ఈమెయిలు చిరునామా"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "భాష"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 0688209cb1673d3c377ff06d246c19cc27684937..f21c24d5a54b3bb6651cf0627fad78c4579ddb7a 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "సహాయం"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index 9719a079784c349f352fc350d23e30826c44a3a6..dac5225d9649091db96ed6a4a0c0d1da073de536 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ea7306a96e26f0abdeab70b1c2285e31bdd1664e..34333c0d2c8b653e4ed9f3c867f8969b98b665eb 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:29+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"
@@ -160,78 +160,82 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:117 js/oc-dialogs.js:247
-msgid "Ok"
+#: js/oc-dialogs.js:117
+msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121 js/oc-dialogs.js:189 js/oc-dialogs.js:240
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:185
-msgid "Choose"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:215
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:222
+#: 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."
@@ -293,7 +297,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr ""
 
@@ -396,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
+#: 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:5
-msgid "Reset email send."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr ""
 
@@ -519,37 +526,37 @@ msgstr ""
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -557,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 2a33aa7dd5fec30e9445a70804e2f7d2d932807e..8fd7f6db36f965975795909e46e06b6bcff0a3df 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr ""
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr ""
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index cd172f299d18b7582993c53f2c845951e47ddb17..bae6373c3ca8b46d36d76faf927c5cbc4d314b76 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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,22 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 954f4fec313eaec998e2634231982d54e1586094..087855ece7c956e0141b89e012bb56e943f1ae4e 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:424
+#: 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:427
+#: 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 ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 75d71eb61d6eb2546f54afc96ed14a6138e131af..d20d28c00fdf7f8670d45ae7cada71086df762dd 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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_trashbin.pot b/l10n/templates/files_trashbin.pot
index fa48d4dd173d407273e79300eab8cd3b049b7660..0bfe193d7bf99a520ae4cbab9a1f049fd320f5a2 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr ""
 
@@ -39,31 +39,31 @@ msgstr ""
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index b4ed2f94607c9a6d7e6ae7a0508aa53e3c7b0b78..657b69658d14a0398fd84eedc0002c5bceaca563 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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 f970e81e27e652423909b614407090a9cf0433b6..7d8550507678c1665ce7bd6fe5a51760b8197a7d 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:29+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,47 +17,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr ""
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr ""
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr ""
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr ""
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr ""
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr ""
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index ace40e933dbd8e378c03fd4b4a384353571afcee..d510c479afd25c66041baf00d900014c0fa42a09 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:29+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"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -116,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:43
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:75
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:88 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:91 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:111 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:262
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:414
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:420
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr ""
 
@@ -419,82 +423,74 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index a912ffc4989d45f4ebdf5f1aeac32cd60eda17c2..26f349e47eb6ebe79e97ea93ef0d5f9a622398a8 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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,6 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,279 +57,361 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 2993850808108e3d7d6ea6fc909540d857db8965..b200d698a7773f21735d4c5aef39be930e91cffc 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-04-13 02:12+0200\n"
+"POT-Creation-Date: 2013-06-04 02:28+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/th_TH/core.po b/l10n/th_TH/core.po
index ff90a06425562e2cc16db454178142136f68ff98..cc103d478aec50d8eb34597a1b1dd01e93732f0e 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
-# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -162,75 +160,79 @@ msgstr "ธันวาคม"
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 นาทีก่อนหน้านี้"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} นาทีก่อนหน้านี้"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} ชั่วโมงก่อนหน้านี้"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{day} วันก่อนหน้านี้"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} เดือนก่อนหน้านี้"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "เลือก"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "ไม่ตกลง"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "ตกลง"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "ไม่ตกลง"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "ตกลง"
 
@@ -245,7 +247,7 @@ msgstr "ชนิดของวัตถุยังไม่ได้รับ
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr "พบข้อผิดพลาด"
+msgstr "ข้อผิดพลาด"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -295,7 +297,7 @@ msgstr "แชร์ด้วยลิงก์"
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "รหัสผ่าน"
 
@@ -398,24 +400,27 @@ msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "รีเซ็ตค่าการส่งอีเมล"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "คำร้องขอล้มเหลว!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "ขอเปลี่ยนรหัสใหม่"
 
@@ -445,11 +450,11 @@ msgstr "ผู้ใช้งาน"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "Apps"
+msgstr "แอปฯ"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "ผู้ดูแลระบบ"
+msgstr "ผู้ดูแล"
 
 #: strings.php:9
 msgid "Help"
@@ -521,75 +526,80 @@ msgstr "ขั้นสูง"
 msgid "Data folder"
 msgstr "โฟลเดอร์เก็บข้อมูล"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "กำหนดค่าฐานข้อมูล"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "รหัสผ่านฐานข้อมูล"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ชื่อฐานข้อมูล"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "พื้นที่ตารางในฐานข้อมูล"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "web services under your control"
+msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "หากคุณยังไม่ได้เปลี่ยนรหัสผ่านของคุณเมื่อเร็วๆนี้, บัญชีของคุณอาจถูกบุกรุกโดยผู้อื่น"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "กรุณาเปลี่ยนรหัสผ่านของคุณอีกครั้ง เพื่อป้องกันบัญชีของคุณให้ปลอดภัย"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "จำรหัสผ่าน"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index e88ab59f410bbf1365cdebcf75b450a8646e2de6..ccfa0c5ddde6475475d76a4f3c3c172dde462092 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
-# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -29,17 +27,13 @@ msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ท
 msgid "Could not move %s"
 msgstr "ไม่สามารถย้าย %s ได้"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "ไม่มีข้อผิดพลาดใดๆ ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
+msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
 #: ajax/upload.php:27
 msgid ""
@@ -50,19 +44,19 @@ msgstr "ขนาดไฟล์ที่อัพโหลดมีขนาด
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "ไฟล์ที่อัพโหลดมีขนาดเกินคำสั่ง MAX_FILE_SIZE ที่ระบุเอาไว้ในรูปแบบคำสั่งในภาษา HTML"
+msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "ไฟล์ที่อัพโหลดยังไม่ได้ถูกอัพโหลดอย่างสมบูรณ์"
+msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "ยังไม่มีไฟล์ที่ถูกอัพโหลด"
+msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย"
+msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -80,57 +74,61 @@ msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "แชร์"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "ดำเนินการตามคำสั่งลบ"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "การอัพโหลดไฟล์"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -154,69 +152,77 @@ msgstr "พื้นที่จัดเก็บข้อมูลของค
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
+msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่ หรือ มีขนาดไฟล์ 0 ไบต์"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "มีพื้นที่เหลือไม่เพียงพอ"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL ไม่สามารถเว้นว่างได้"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
-msgstr "ปรับปรุงล่าสุด"
+msgstr "แก้ไขแล้ว"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
+#: 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 "อัพโหลด"
@@ -277,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "ยกเลิกการแชร์ข้อมูล"
+msgstr "ยกเลิกการแชร์"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 0f055b572fb2206003e2cb999e9158c0e1947511..c52fe69a4c4ce19c16992bba2ff01312768d7509 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "กำลังบันทึกข้อมูล..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "การเข้ารหัส"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "ไม่ต้อง"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 6b7ff0b4d4db0ec75a3cf97ddd0be068320eb56c..b8329a6124b2898d6b284942f7feec8653600343 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -38,19 +37,26 @@ msgstr "กรุณากรอกรหัส app key ของ Dropbox แล
 msgid "Error configuring Google Drive storage"
 msgstr "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง."
 
-#: lib/config.php:426
+#: 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 "<b>คำเตือน:</b> การสนับสนุนการใช้งาน FTP ในภาษา PHP ยังไม่ได้ถูกเปิดใช้งานหรือถูกติดตั้ง. การชี้ FTP เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง"
 
+#: 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 "พื้นทีจัดเก็บข้อมูลจากภายนอก"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index ca52d4c44496a38fe0df7e1b9af0444355294829..49c70f024bf7c8d204ecb9eac6dd2c49dbbd0b10 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 11:10+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,24 +25,24 @@ msgstr "รหัสผ่าน"
 msgid "Submit"
 msgstr "ส่ง"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
 
-#: templates/public.php:37
+#: 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 fdca6cdab3e120d0bdbf0eb0ed6fef8941901e27..bfcb4d2f46d98a65d7bf5aceac6f74ab584fd05b 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "ดำเนินการคืนค่า"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -40,31 +39,31 @@ msgstr "ข้อผิดพลาด"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "ลบแล้ว"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 1abe7bfdb5e7bbec2b871677c1ca8a4d121434a0..484c5c2cdad15fbed73559d5792550b3d66372ed 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +40,17 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 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"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index b467ff8d622cd44e459a6276e3ca42f547c8a511..50f9ae0bb9d79d5effb3e852cdd9138a01375e8a 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "แอปฯ"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "ไม่สามารถกำหนดได้"
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,83 +113,87 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "วินาทีที่ผ่านมา"
+msgstr "วินาที ก่อนหน้านี้"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1 นาทีมาแล้ว"
+msgstr "1 นาทีก่อนหน้านี้"
 
 #: template.php:115
 #, php-format
@@ -238,20 +237,7 @@ msgstr "ปีที่แล้ว"
 
 #: template.php:124
 msgid "years ago"
-msgstr "ปีที่ผ่านมา"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s พร้อมให้ใช้งานได้แล้ว. <a href=\"%s\">ดูรายละเอียดเพิ่มเติม</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "ทันสมัย"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้"
+msgstr "ปี ที่ผ่านมา"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 7d8053ea080184a825c20f3eecae5d50e4b67ae2..3f942a49f7505a9e35e7f677511d6e5fb8805386 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
-# AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
-#   <icewind1991@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
+msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -119,52 +120,52 @@ msgstr "เกิดข้อผิดพลาดในระหว่างก
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "กำลังบันทึุกข้อมูล..."
+msgstr "กำลังบันทึกข้อมูล..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "ลบแล้ว"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "ผู้ดูแลกลุ่ม"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -234,59 +235,59 @@ 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 ""
 "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 เรียกหน้าเว็บ cron.php ที่ตำแหน่ง root ของ owncloud หลังจากนี้สักครู่ผ่านทาง http"
 
 #: 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 จากระบบ เรียกไฟล์ cron.php ในโฟลเดอร์ owncloud ผ่านทาง cronjob ของระบบหลังจากนี้สักครู่"
 
 #: 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"
@@ -309,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "บันทึกการเปลี่ยนแปลง"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "ระดับการเก็บบันทึก log"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "รหัสผ่าน"
 
@@ -422,82 +423,74 @@ msgstr "รหัสผ่านใหม่"
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "ชื่อที่ต้องการแสดง"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "อีเมล์"
+msgstr "อีเมล"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "ที่อยู่อีเมล์ของคุณ"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "ภาษา"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "ช่วยกันแปล"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "สร้าง"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "ไม่จำกัดจำนวน"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "พื้นที่จัดเก็บข้อมูล"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "เปลี่ยนชื่อที่ต้องการให้แสดง"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "ตั้งค่ารหัสผ่านใหม่"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index f4b4608ec5e6b675de8f5014210894f8dd57c837..53635d7dc984f4d78ab28a8b9bcd484da3fdd48d 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "การลบการกำหนดค่าเซิร์ฟเวอร์ล้มเหลว"
@@ -54,281 +57,363 @@ msgstr "รักษาการตั้งค่าไว้?"
 msgid "Cannot add server configuration"
 msgstr "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้"
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "ทดสอบการเชื่อมต่อล้มเหลว"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "ยืนยันการลบทิ้ง"
 
-#: templates/settings.php:8
+#: 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 "<b>คำเตือน:</b> แอปฯ user_ldap และ user_webdavauth ไม่สามารถใช้งานร่วมกันได้. คุณอาจประสพปัญหาที่ไม่คาดคิดจากเหตุการณ์ดังกล่าว กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อระงับการใช้งานแอปฯ ตัวใดตัวหนึ่งข้างต้น"
 
-#: templates/settings.php:11
+#: 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 "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "การกำหนดค่าเซิร์ฟเวอร์"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "เพิ่มการกำหนดค่าเซิร์ฟเวอร์"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "โฮสต์"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN ฐาน"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "หนึ่ง Base DN ต่อบรรทัด"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN ของผู้ใช้งาน"
 
-#: templates/settings.php:45
+#: 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 "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
 
-#: templates/settings.php:53
+#: 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 "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "ตัวกรองข้อมูลกลุ่ม"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "ตั้งค่าการเชื่อมต่อ"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "ปิดใช้งานเซิร์ฟเวอร์หลัก"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "ใช้ TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "ตั้งค่าไดเร็กทอรี่"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "รายการผู้ใช้งานหลักแบบ Tree"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "หนึ่ง User Base DN ต่อบรรทัด"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "คุณลักษณะการค้นหาชื่อผู้ใช้"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "รายการกลุ่มหลักแบบ Tree"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "หนึ่ง Group Base DN ต่อบรรทัด"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "คุณลักษณะการค้นหาแบบกลุ่ม"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "คุณลักษณะพิเศษ"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index 3493831b2c1f7084a9e3ea50b006b5c15877bea4..af83ef0d0060b2434360e33667e3cbd4ba5261b1 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-22 00:54+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "WebDAV Authentication"
 msgid "URL: http://"
 msgstr "URL: http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 4d50d6acf213e2a1afa9a3489226fbaba73d467c..b7d787595bc1bbb78794f09667a077756a49540d 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
-# Caner BaÅŸaran <basaran.caner@gmail.com>, 2012.
-# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
-#   <info@beyboo.de>, 2012.
-# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: otefenli <otefenli@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,75 +161,79 @@ msgstr "Aralık"
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "saniye önce"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 dakika önce"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} dakika önce"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 saat önce"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} saat önce"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} gün önce"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} ay önce"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "ay önce"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "yıl önce"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "seç"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Hayır"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Hayır"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Tamam"
 
@@ -300,7 +298,7 @@ msgstr "Bağlantı ile paylaş"
 msgid "Password protect"
 msgstr "Şifre korunması"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Parola"
 
@@ -403,24 +401,27 @@ msgstr "ownCloud parola sıfırlama"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek."
+#: 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 "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>I Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Sıfırlama epostası gönderildi."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Isteği başarısız oldu!<br>E-posta / kullanıcı adınızı doğru olduğundan emin misiniz?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Ä°stek reddedildi!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilecek."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Kullanıcı adı"
+msgstr "Kullanıcı Adı"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Sıfırlama iste"
 
@@ -458,7 +459,7 @@ msgstr "Yönetici"
 
 #: strings.php:9
 msgid "Help"
-msgstr "Yardı"
+msgstr "Yardım"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -526,75 +527,80 @@ msgstr "GeliÅŸmiÅŸ"
 msgid "Data folder"
 msgstr "Veri klasörü"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Veritabanını ayarla"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "kullanılacak"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Veritabanı kullanıcı adı"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Veritabanı adı"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Veritabanı tablo alanı"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Veritabanı sunucusu"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "kontrolünüzdeki web servisleri"
+msgstr "Bilgileriniz güvenli ve şifreli"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Çıkış yap"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Otomatik oturum açma reddedildi!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Yakın zamanda parolanızı değiştirmedi iseniz hesabınız riske girebilir."
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Hesabınızı korumak için lütfen parolanızı değiştirin."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "hatırla"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "GiriÅŸ yap"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Alternatif GiriÅŸler"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 739b2b604d22f84086c2044487ca8aa6be354760..0b0da38b58edf1e69ba4f4b739f2ce295bf8cdc1 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -3,19 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
-# Caner BaÅŸaran <basaran.caner@gmail.com>, 2012.
-# Emre  <emresaracoglu@live.com>, 2012.
-#   <info@beyboo.de>, 2012.
-# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
+# 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 13:30+0000\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -34,17 +28,13 @@ msgstr "%s taşınamadı. Bu isimde dosya zaten var."
 msgid "Could not move %s"
 msgstr "%s taşınamadı"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Dosya adı değiştirilemedi"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
-msgstr "Bir hata yok, dosya başarıyla yüklendi"
+msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
 #: ajax/upload.php:27
 msgid ""
@@ -55,19 +45,19 @@ msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme s
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Yüklenen dosya HTML formundaki MAX_FILE_SIZE sınırını aşıyor"
+msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Yüklenen dosyanın sadece bir kısmı yüklendi"
+msgstr "Dosya kısmen karşıya yüklenebildi"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Hiç dosya yüklenmedi"
+msgstr "Hiç dosya gönderilmedi"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "Geçici bir klasör eksik"
+msgstr "Geçici dizin eksik"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -85,55 +75,59 @@ msgstr "Geçersiz dizin."
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "PaylaÅŸ"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Sil"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "Öneri ad"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "Silme işlemini gerçekleştir"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 dosya yüklendi"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "Dosyalar yükleniyor"
 
@@ -159,69 +153,77 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkron
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Yeterli disk alanı yok"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL boÅŸ olamaz."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Hata"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "Ad"
+msgstr "Ä°sim"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} dosya"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir."
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "Dosya adı değiştirilemedi"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Yükle"
@@ -282,37 +284,37 @@ msgstr "Dosyalar silindi"
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "Buraya erişim hakkınız yok."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "Yüklemeniz çok büyük"
+msgstr "Yükleme çok büyük"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Güncel tarama"
 
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 52609fb3a4e0799c1ca0da25772613e88a5b6c32..82ddb74c5d7030a94513d502522e6486ece32d6f 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -3,38 +3,101 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 20:10+0000\n"
-"Last-Translator: atakan96 <tayancatakan@gmail.com>\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"
 "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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Kaydediliyor..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Åžifreleme"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Dosya ÅŸifreleme aktif."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Belirtilen dosya tipleri ÅŸifrelenmeyecek:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Seçilen dosya tiplerini şifreleme:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Hiçbiri"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 83ae30ab69154e9facbc09dcaca93640986c98d1..4d0e704f51317d65c831fabc0919fafa69dd9c77 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Caner BaÅŸaran <basaran.caner@gmail.com>, 2013.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-05 00:21+0200\n"
-"PO-Revision-Date: 2013-04-04 10:00+0000\n"
-"Last-Translator: Caner BaÅŸaran <basaran.caner@gmail.com>\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"
 "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"
@@ -40,18 +37,25 @@ msgstr "Lütfen Dropbox app key ve secret temin ediniz"
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive depo yapılandırma hatası"
 
-#: lib/config.php:423
+#: 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 ""
+msgstr "<b>Uyari.</b>''smbclient''yüklü değil. Mont etme CIFS/SMB hissenin mümkün değildir. Lutfen kullanici sistemin sormak onu yuklemek ici,  "
 
-#: lib/config.php:426
+#: 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 ""
+msgstr "<Uyari.</b>. Sistem FTP PHPden aktif degil veya yuklemedi. Monte etme hissenin FTP mumkun degildir. Lutfen kullaniici sistemin sormak onu yuklemek icin."
+
+#: 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 "<b> Ihbar </b>. Dayanma Curl PHPden aktif veya yuklemedi degil. Monte ownClouden/WebDay veya GoogleDrive mumkun degil. Lutfen sistm yonetici sormak yuklemek icin. "
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 5cef16c9263ce487a529447680b4dafc2c6e54cc..8a76095d7ef6c1c15bc33df20e2294e178d846da 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -3,47 +3,46 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <info@beyboo.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 11:33+0000\n"
-"Last-Translator: alpere <info@beyboo.de>\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"
 "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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "Åžifre"
+msgstr "Parola"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr "Gönder"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s sizinle paylaşılan  %s klasör"
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s sizinle paylaşılan  %s klasör"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Kullanılabilir önizleme yok"
 
-#: templates/public.php:43
+#: 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 53600dc03d6d973704c4c51b747b52edfc3b8562..254222c64b562096b7f93d7ef60c364f361cab34 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -29,11 +27,11 @@ msgstr "%s Kalıcı olarak silinemedi"
 msgid "Couldn't restore %s"
 msgstr "%s Geri yüklenemedi"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "Geri yükleme işlemini gerçekleştir"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Hata"
 
@@ -41,31 +39,31 @@ msgstr "Hata"
 msgid "delete file permanently"
 msgstr "Dosyayı kalıcı olarak sil"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Silindi"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} dosya"
 
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 59ad4923c43f29c10c4cd296ec86d757c06ac98b..9f1d643d13ec99f02e43ea366392a4d64783f067 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-25 10:20+0000\n"
-"Last-Translator: otefenli <otefenli@gmail.com>\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"
 "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"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 1bd6591c2e79f9c3a9b402eb636be5ff383ce902..e1d3e4a420d489d7c059b5e382e2797c8b4bcef8 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
+# 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,47 +18,47 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
-msgstr "Yardı"
+msgstr "Yardım"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "KiÅŸisel"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Yönetici"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatılmıştır."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Dosyaların birer birer indirilmesi gerekmektedir."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Dosyalara dön"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyüktür."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "tespit edilemedi"
 
@@ -89,102 +88,102 @@ msgstr "Resimler"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Bir adi kullanici vermek. "
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
+msgstr "Parola yonetici birlemek. "
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s veritabanı kullanıcı adını gir."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s veritabanı adını gir."
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s veritabanı adında nokta kullanamayabilirsiniz"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s veritabanı sunucu adını tanımla"
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Bir konto veya kullanici birlemek ihtiyacin. "
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "DB Hata: ''%s''"
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Komut rahasiz ''%s''. "
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL kullanici '%s @local host zatan var. "
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Bu kullanici MySQLden list disari koymak. "
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Bu kulanıcıyı MySQL veritabanından kaldır"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. "
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, 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."
@@ -241,19 +240,6 @@ msgstr "geçen yıl"
 msgid "years ago"
 msgstr "yıl önce"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s kullanılabilir durumda. <a href=\"%s\">Daha fazla bilgi</a> alın"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "güncel"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "güncelleme kontrolü kapalı"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 9affb093ec9ecad8302cd06df05cc894e7b23ad9..7b467a0b707428cc424465165c65e03d6e942a30 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -3,22 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Aranel Surion <aranel@aranelsurion.org>, 2011-2013.
-# Caner BaÅŸaran <basaran.caner@gmail.com>, 2013.
-# Emre  <emresaracoglu@live.com>, 2012.
-# Fatih Aşıcı <fatih.asici@gmail.com>, 2013.
-# H.Oktay Tefenli <otefenli@gmail.com>, 2013.
-#   <info@beyboo.de>, 2012.
-# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# Tolga GezginiÅŸ <tgezginis@gmail.com>, 2013.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Fatih Aşıcı <fatih.asici@gmail.com>\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"
 "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"
@@ -30,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "App Store'dan liste yüklenemiyor"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "EÅŸleÅŸme hata"
+msgstr "Kimlik doğrulama hatası"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "Görüntülenen isminiz değiştirildi."
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Ekran adı değiştirilemiyor"
 
@@ -103,7 +99,7 @@ msgstr "Etkin deÄŸil"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "Etkin"
+msgstr "EtkinleÅŸtir"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -125,52 +121,52 @@ msgstr "Uygulama güncellenirken hata"
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "silindi"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "geri al"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Kullanıcı kaldırılamıyor"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Gruplar"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Yönetici Grubu "
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Sil"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "grup ekle"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Kullanıcı oluşturulurken hata"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Geçerli bir parola mutlaka sağlanmalı"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Türkçe"
 
@@ -321,19 +317,19 @@ msgstr "Kayıtlar"
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -404,7 +400,7 @@ msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Parola"
 
@@ -428,82 +424,74 @@ msgstr "Yeni parola"
 msgid "Change password"
 msgstr "Parola deÄŸiÅŸtir"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Ekran Adı"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Ekran adınız değiştirildi"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Ekran adınız değiştirilemiyor"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Ekran adını değiştir"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Giriş Adı"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "OluÅŸtur"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Varsayılan Depolama"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Limitsiz"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "DiÄŸer"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Depolama"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "ekran adını değiştir"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "yeni parola belirle"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 1cfb5d5aca8f3e506148c29dcac3c1704f040cd6..dabf4606c8e9dbf1ca38ee92ee860e4eb0399594 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
+# ismail yenigül <ismail.yenigul@surgate.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-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,25 +19,29 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Sunucu yapılandırmasını silme başarısız oldu"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Yapılandırma geçerli ve bağlantı kuruldu!"
 
 #: ajax/testConfiguration.php:39
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr ""
+msgstr "Yapılandırma geçerli fakat bağlanma(bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol ediniz."
 
 #: ajax/testConfiguration.php:43
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."
-msgstr ""
+msgstr "Yapılandırma geçersiz. Daha fazla detay için lütfen ownCloud günlüklerine bakınız."
 
 #: js/settings.js:66
 msgid "Deletion failed"
@@ -45,291 +49,373 @@ msgstr "Silme başarısız oldu"
 
 #: js/settings.js:82
 msgid "Take over settings from recent server configuration?"
-msgstr ""
+msgstr "Ayarları son sunucu yapılandırmalarından devral?"
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr "Ayarları kalsınmı?"
+msgstr "Ayarlar kalsın mı?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
+msgstr "Sunucu yapılandırması eklenemedi"
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:117
+msgid "Error"
+msgstr "Hata"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr "Bağlantı testi başarılı oldu"
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Bağlantı testi başarısız oldu"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Silmeyi onayla"
 
-#: templates/settings.php:8
+#: 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 ""
+msgstr "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. "
 
-#: templates/settings.php:11
+#: 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 ""
+msgstr "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak  yuklemek icin."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
-msgstr ""
+msgstr "Sunucu uyunlama "
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Sunucu Uyunlama birlemek "
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Sunucu"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. "
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Ana DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
-msgstr ""
+msgstr "Bir Tabani DN herbir dizi. "
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Base DN kullanicileri  ve kaynaklari icin tablosu Advanced tayin etmek ederiz. "
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Kullanıcı DN"
 
-#: templates/settings.php:45
+#: 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 ""
+msgstr "DN musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN  ve Parola bos birakmak. "
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Parola"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Kullanıcı Oturum Filtresi"
 
-#: templates/settings.php:53
+#: 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 ""
+msgstr "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Kullanıcı Liste Filtresi"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi  kullanici geri aliyor. "
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Grup Süzgeci"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Bağlantı ayarları"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
-msgstr ""
+msgstr "Ne zaman iptal, bu uynnlama isletici "
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
-msgstr ""
+msgstr "Sigorta Kopya Cephe "
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Kopya Port "
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Ana sunucuyu devredışı birak"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
-msgstr ""
+msgstr "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "TLS kullan"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr ""
+msgstr "Bu LDAPS baglama icin kullamaminiz, basamacak. "
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Dusme sunucu LDAP zor degil. (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "SSL sertifika doğrulamasını kapat."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Önerilmez, sadece test için kullanın."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Cache Time-To-Live "
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
-msgstr ""
+msgstr "Parametrar Listesin Adresinin "
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. "
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Temel Kullanıcı Ağacı"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
-msgstr ""
+msgstr "Bir Temel Kullanici DN her dizgi "
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Kategorii Arama Kullanici "
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Grub Ekrane Alani Adi"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP kullamayin grub adi ownCloud uremek icin. "
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Temel Grup Ağacı"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
-msgstr ""
+msgstr "Bir Grubu Tabani DN her dizgi. "
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Kategorii Arama Grubu"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Grup-Ãœye iÅŸbirliÄŸi"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "byte cinsinden"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Yardım"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index f5f060e198ce141eeb8eb7f42abaf3f0d89718e5..03ee4902c8e8ff8ac92401437edeabd04fedbf84 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -3,22 +3,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <info@beyboo.de>, 2012.
-# Necdet Yücel <necdetyucel@gmail.com>, 2012.
-# TayançKILIÇLI <tayancatakan@gmail.com>, 2013.
+# alpere <info@beyboo.de>, 2012
+# Necdet Yücel <necdetyucel@gmail.com>, 2012
+# atakan96 <tayancatakan@gmail.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-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 20:10+0000\n"
-"Last-Translator: atakan96 <tayancatakan@gmail.com>\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"
 "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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
@@ -33,4 +34,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 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/l10n/ug/core.po b/l10n/ug/core.po
new file mode 100644
index 0000000000000000000000000000000000000000..dd031f3fd9fd6f643ec070e7b1763a141da3c40c
--- /dev/null
+++ b/l10n/ug/core.po
@@ -0,0 +1,617 @@
+# 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-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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"
+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 "1 مىنۇت ئىلگىرى"
+
+#: js/js.js:720
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:721
+msgid "1 hour ago"
+msgstr "1 سائەت ئىلگىرى"
+
+#: 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 "ھەمبەھىر"
+
+#: 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:48
+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:21
+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/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr "قوش"
+
+#: 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.guest.php:40
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
+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/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/ug/files.po b/l10n/ug/files.po
new file mode 100644
index 0000000000000000000000000000000000000000..48bf941b88fcd3d8aed356e366f4878381735857
--- /dev/null
+++ b/l10n/ug/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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 "%s يۆتكىيەلمەيدۇ"
+
+#: 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 "ھەمبەھىر"
+
+#: 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 "{new_name} مەۋجۇت"
+
+#: 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 "1 ھۆججەت يۈكلىنىۋاتىدۇ"
+
+#: 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 "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
+
+#: js/files.js:486
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:491
+msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
+msgstr ""
+
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+msgid "Error"
+msgstr "خاتالىق"
+
+#: js/files.js:877 templates/index.php:69
+msgid "Name"
+msgstr "ئاتى"
+
+#: js/files.js:878 templates/index.php:80
+msgid "Size"
+msgstr "چوڭلۇقى"
+
+#: js/files.js:879 templates/index.php:82
+msgid "Modified"
+msgstr "ئۆزگەرتكەن"
+
+#: js/files.js:898
+msgid "1 folder"
+msgstr "1 قىسقۇچ"
+
+#: js/files.js:900
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:908
+msgid "1 file"
+msgstr "1 ھۆججەت"
+
+#: js/files.js:910
+msgid "{count} files"
+msgstr "{count} ھۆججەت"
+
+#: 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 "ساقلا"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "يېڭى"
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr "تېكىست ھۆججەت"
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr "قىسقۇچ"
+
+#: 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 "بۇ جايدا ھېچنېمە يوق. Upload something!"
+
+#: 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/ug/files_encryption.po b/l10n/ug/files_encryption.po
new file mode 100644
index 0000000000000000000000000000000000000000..e3519652c883818b8cdb306914ffcbb687c56ec6
--- /dev/null
+++ b/l10n/ug/files_encryption.po
@@ -0,0 +1,103 @@
+# 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-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"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "ساقلاۋاتىدۇ…"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr "شىفىرلاش"
+
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
new file mode 100644
index 0000000000000000000000000000000000000000..0f35adf4321f29baeb5d277dc55f93d7e6ae2e30
--- /dev/null
+++ b/l10n/ug/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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/ug/files_sharing.po b/l10n/ug/files_sharing.po
new file mode 100644
index 0000000000000000000000000000000000000000..5958fbcb41b184998e1086b5a68f2a61481fbd54
--- /dev/null
+++ b/l10n/ug/files_sharing.po
@@ -0,0 +1,49 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# uqkun <uqkun@outlook.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: uqkun <uqkun@outlook.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#: 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
new file mode 100644
index 0000000000000000000000000000000000000000..7442a2e88774ce964c7474b9ee67edc97b90c59a
--- /dev/null
+++ b/l10n/ug/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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 "ئاتى"
+
+#: js/trash.js:177 templates/index.php:27
+msgid "Deleted"
+msgstr "ئۆچۈرۈلدى"
+
+#: js/trash.js:186
+msgid "1 folder"
+msgstr "1 قىسقۇچ"
+
+#: js/trash.js:188
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:196
+msgid "1 file"
+msgstr "1 ھۆججەت"
+
+#: js/trash.js:198
+msgid "{count} files"
+msgstr "{count} ھۆججەت"
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!"
+
+#: 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/ug/files_versions.po b/l10n/ug/files_versions.po
new file mode 100644
index 0000000000000000000000000000000000000000..65557768200c49138a82cb6389cafb9a266b908a
--- /dev/null
+++ b/l10n/ug/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-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr "ئەسلىگە قايتۇرالمايدۇ: %s"
+
+#: history.php:40
+msgid "success"
+msgstr "مۇۋەپپەقىيەتلىك"
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr "ھۆججەت %s نى %s نەشرىگە ئەسلىگە قايتۇردى"
+
+#: 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/ug/lib.po b/l10n/ug/lib.po
new file mode 100644
index 0000000000000000000000000000000000000000..2cfea82974e77782e65f61e8c07f6ddbd97cf3ff
--- /dev/null
+++ b/l10n/ug/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-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: app.php:357
+msgid "Help"
+msgstr "ياردەم"
+
+#: app.php:370
+msgid "Personal"
+msgstr "شەخسىي"
+
+#: app.php:381
+msgid "Settings"
+msgstr "تەڭشەكلەر"
+
+#: app.php:393
+msgid "Users"
+msgstr "ئىشلەتكۈچىلەر"
+
+#: app.php:406
+msgid "Apps"
+msgstr "ئەپلەر"
+
+#: app.php:414
+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:132 setup.php:329 setup.php:374
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:133 setup.php:238
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:237
+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
+#, 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:309
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:314
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:315
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:644
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:867
+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
+#, 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 "1 مىنۇت ئىلگىرى"
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr "%d مىنۇت ئىلگىرى"
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr "1 سائەت ئىلگىرى"
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr "%d سائەت ئىلگىرى"
+
+#: template.php:118
+msgid "today"
+msgstr "بۈگۈن"
+
+#: template.php:119
+msgid "yesterday"
+msgstr "تۈنۈگۈن"
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr "%d كۈن ئىلگىرى"
+
+#: template.php:121
+msgid "last month"
+msgstr ""
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr "%d ئاي ئىلگىرى"
+
+#: 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/ug/settings.po b/l10n/ug/settings.po
new file mode 100644
index 0000000000000000000000000000000000000000..2b56b400e9021047e7029f4606dc2ed985a21633
--- /dev/null
+++ b/l10n/ug/settings.po
@@ -0,0 +1,496 @@
+# 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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:17+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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:24
+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 "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ"
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ"
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr "ئەپنى يېڭىلىيالمايدۇ."
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr "{appversion} غا يېڭىلايدۇ"
+
+#: 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 "ساقلاۋاتىدۇ…"
+
+#: 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:83
+#: templates/users.php:108
+msgid "Groups"
+msgstr "گۇرۇپپا"
+
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
+msgid "Group Admin"
+msgstr "گۇرۇپپا باشقۇرغۇچى"
+
+#: js/users.js:115 templates/users.php:160
+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:111
+msgid "Version"
+msgstr "نەشرى"
+
+#: templates/admin.php:237 templates/personal.php:114
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"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:11
+msgid "Add your App"
+msgstr "ئەپىڭىزنى قوشۇڭ"
+
+#: templates/apps.php:12
+msgid "More Apps"
+msgstr "تېخىمۇ كۆپ ئەپلەر"
+
+#: templates/apps.php:28
+msgid "Select an App"
+msgstr "بىر ئەپ تاللاڭ"
+
+#: templates/apps.php:34
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:36
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:38
+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:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:15
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:26
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+msgid "Password"
+msgstr "ئىم"
+
+#: templates/personal.php:38
+msgid "Your password was changed"
+msgstr "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى"
+
+#: templates/personal.php:39
+msgid "Unable to change your password"
+msgstr "ئىمنى ئۆزگەرتكىلى بولمايدۇ."
+
+#: templates/personal.php:40
+msgid "Current password"
+msgstr "نۆۋەتتىكى ئىم"
+
+#: templates/personal.php:42
+msgid "New password"
+msgstr "يېڭى ئىم"
+
+#: templates/personal.php:44
+msgid "Change password"
+msgstr "ئىم ئۆزگەرت"
+
+#: templates/personal.php:56 templates/users.php:81
+msgid "Display Name"
+msgstr "كۆرسىتىش ئىسمى"
+
+#: templates/personal.php:71
+msgid "Email"
+msgstr "تورخەت"
+
+#: templates/personal.php:73
+msgid "Your email address"
+msgstr "تورخەت ئادرېسىڭىز"
+
+#: templates/personal.php:74
+msgid "Fill in an email address to enable password recovery"
+msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
+
+#: templates/personal.php:83 templates/personal.php:84
+msgid "Language"
+msgstr "تىل"
+
+#: templates/personal.php:95
+msgid "Help translate"
+msgstr "تەرجىمىگە ياردەم"
+
+#: templates/personal.php:100
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: templates/personal.php:102
+msgid "Use this address to connect to your ownCloud in your file manager"
+msgstr ""
+
+#: templates/users.php:21 templates/users.php:80
+msgid "Login Name"
+msgstr "تىزىمغا كىرىش ئاتى"
+
+#: templates/users.php:30
+msgid "Create"
+msgstr "قۇر"
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
+msgid "Default Storage"
+msgstr "كۆڭۈلدىكى ساقلىغۇچ"
+
+#: templates/users.php:44 templates/users.php:138
+msgid "Unlimited"
+msgstr "چەكسىز"
+
+#: templates/users.php:62 templates/users.php:153
+msgid "Other"
+msgstr "باشقا"
+
+#: templates/users.php:87
+msgid "Storage"
+msgstr "ساقلىغۇچ"
+
+#: templates/users.php:98
+msgid "change display name"
+msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
+
+#: templates/users.php:102
+msgid "set new password"
+msgstr "يېڭى ئىم تەڭشە"
+
+#: templates/users.php:133
+msgid "Default"
+msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
new file mode 100644
index 0000000000000000000000000000000000000000..a4e5eec6d2beb5a1be26ccf9a1b4bafed663a3e3
--- /dev/null
+++ b/l10n/ug/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-03 02:27+0200\n"
+"PO-Revision-Date: 2013-06-02 23:18+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\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 "TLS ئىشلەت"
+
+#: 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/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
new file mode 100644
index 0000000000000000000000000000000000000000..544a8b946eddd0197cb3d989c8cff1d899daf762
--- /dev/null
+++ b/l10n/ug/user_webdavauth.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# uqkun <uqkun@outlook.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"
+"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"Language-Team: Uighur <uqkun@outlook.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV سالاھىيەت دەلىللەش"
+
+#: templates/settings.php:4
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: 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/uk/core.po b/l10n/uk/core.po
index 6058358be3b481def7eb54e1b484fc867908bb2a..89433cccc971ca4e78bcde2a9e475bf4d7c93bbd 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -3,18 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dzubchikd@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
-# Soul Kim <warlock.rf@gmail.com>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-#   <volodya327@gmail.com>, 2013.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -166,75 +160,79 @@ msgstr "Грудень"
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 хвилину тому"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} хвилин тому"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 годину тому"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} години тому"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} днів тому"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} місяців тому"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "роки тому"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Обрати"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Відмінити"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Ні"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Так"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Ні"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -299,7 +297,7 @@ msgstr "Опублікувати через посилання"
 msgid "Password protect"
 msgstr "Захистити паролем"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Пароль"
 
@@ -337,7 +335,7 @@ msgstr "Опубліковано {item} для {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Заборонити доступ"
+msgstr "Закрити доступ"
 
 #: js/share.js:320
 msgid "can edit"
@@ -402,24 +400,27 @@ msgstr "скидання пароля ownCloud"
 msgid "Use the following link to reset your password: {link}"
 msgstr "Використовуйте наступне посилання для скидання пароля: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "Лист скидання відправлено."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Невдалий запит!"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Запит скидання"
 
@@ -453,7 +454,7 @@ msgstr "Додатки"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Адміністратор"
+msgstr "Адмін"
 
 #: strings.php:9
 msgid "Help"
@@ -482,11 +483,11 @@ msgstr "Попередження про небезпеку"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Будь ласка, оновіть інсталяцію PHP для безпечного використання ownCloud."
 
 #: templates/installation.php:32
 msgid ""
@@ -525,75 +526,80 @@ msgstr "Додатково"
 msgid "Data folder"
 msgstr "Каталог даних"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Налаштування бази даних"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Пароль для бази даних"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Назва бази даних"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Таблиця бази даних"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Хост бази даних"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "веб-сервіс під вашим контролем"
+msgstr "підконтрольні Вам веб-сервіси"
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Вихід"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Автоматичний вхід в систему відхилений!"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Якщо Ви не міняли пароль останнім часом, Ваш обліковий запис може бути скомпрометованим!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Будь ласка, змініть свій пароль, щоб знову захистити Ваш обліковий запис."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Забули пароль?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "запам'ятати"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Вхід"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Альтернативні Логіни"
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index fb93b18e8a780fc1e0e90e31ac64c4dffe32e5bd..9c95991d399b43c0b3a92eae896d5b95210f749f 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dzubchikd@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
-# Soul Kim <warlock.rf@gmail.com>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -31,10 +27,6 @@ msgstr "Не вдалося перемістити %s - Файл з таким 
 msgid "Could not move %s"
 msgstr "Не вдалося перемістити %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Не вдалося перейменувати файл"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Не завантажено жодного файлу. Невідома помилка"
@@ -82,57 +74,61 @@ msgstr "Невірний каталог."
 msgid "Files"
 msgstr "Файли"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Поділитися"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "заміна"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "запропонуйте назву"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "відміна"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "виконати операцію видалення"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 файл завантажується"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "файли завантажуються"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -156,72 +152,80 @@ msgstr "Ваше сховище переповнене, файли більше
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "Місця більше немає"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL не може бути пустим."
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Помилка"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} файлів"
 
+#: 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 "Відвантажити"
+msgstr "Вивантажити"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -279,37 +283,37 @@ msgstr "Видалено файлів"
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "У вас тут немає прав на запис."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Заборонити доступ"
+msgstr "Закрити доступ"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Поточне сканування"
 
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index f0341a7e32ca2e9f8297a8213713ec4b2f620706..ea28d0078fa239940b7f0f8e79e542717cc721b8 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <skoptev@ukr.net>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 16:40+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +17,87 @@ 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"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Зберігаю..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Увімкнуто шифрування файлів."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Такі типи файлів шифруватись не будуть:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Виключити наступні типи файлів з ​​шифрування:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Жоден"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index a8da037d32874162bb4f0cabbfbef49b8957ac9d..c9962845ce8033e0afa43790e3f06d1bc45de71d 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <skoptev@ukr.net>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,19 +37,26 @@ msgstr "Будь ласка, надайте дійсний ключ та пар
 msgid "Error configuring Google Drive storage"
 msgstr "Помилка при налаштуванні сховища Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його."
 
-#: lib/config.php:426
+#: 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 "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її."
 
+#: 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 "Зовнішні сховища"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index a087b632037262eb6ea1c6b7ceb1b3fb4f17d24e..c87feb1467fed032ea950803e5ffe1ae85194029 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <skoptev@ukr.net>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 13:21+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,26 +23,26 @@ msgstr "Пароль"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr "Submit"
+msgstr "Передати"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s опублікував каталог %s для Вас"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s опублікував файл %s для Вас"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Попередній перегляд недоступний для"
 
-#: templates/public.php:35
+#: 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 8219dfe45a17748e2c7542dc4f86ff9410cd524a..bb0bb28ba04fe5b6c42ac986f5f74bce696bac3a 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Неможливо видалити %s назавжди"
 msgid "Couldn't restore %s"
 msgstr "Неможливо відновити %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "виконати операцію відновлення"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Помилка"
 
@@ -40,31 +39,31 @@ msgstr "Помилка"
 msgid "delete file permanently"
 msgstr "видалити файл назавжди"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Видалено"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} файлів"
 
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 57d0fd1f10c97020c8b1d9f546844e76b7a676da..7fb44a00e8b084ee0d5b914e1d5ede9f2891db50 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <skoptev@ukr.net>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-05 12:40+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index f6a6018b773d865b59b1d9b9bdc62979eb5d936c..f843a4ff464472846a8df28df361dabb3bd53ae4 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -3,18 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dzubchikd@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
-#   <victor.dubiniuk@gmail.com>, 2012.
-#   <volodya327@gmail.com>, 2013.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,47 +17,47 @@ 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:349
+#: app.php:357
 msgid "Help"
 msgstr "Допомога"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Особисте"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Налаштування"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Користувачі"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Додатки"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Адмін"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP завантаження вимкнено."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Вибрані фали завеликі для генерування zip файлу."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "не може бути визначено"
 
@@ -98,10 +93,6 @@ msgstr "Встановіть ім'я адміністратора."
 msgid "Set an admin password."
 msgstr "Встановіть пароль адміністратора."
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "Вкажіть теку для даних."
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -122,72 +113,76 @@ msgstr "%s не можна використовувати крапки в наз
 msgid "%s set the database host."
 msgstr "%s встановити хост бази даних."
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle ім'я користувача та/або пароль не дійсні"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Помилка БД: \"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Команда, що викликала проблему: \"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Користувач MySQL '%s'@'localhost' вже існує."
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "Видалити цього користувача з MySQL"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Користувач MySQL '%s'@'%%' вже існує"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "Видалити цього користувача з MySQL."
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle ім'я користувача та/або пароль не дійсні"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
@@ -244,19 +239,6 @@ msgstr "минулого року"
 msgid "years ago"
 msgstr "роки тому"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s доступно. Отримати <a href=\"%s\">детальну інформацію</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "оновлено"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "перевірка оновлень відключена"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 88056cf548a44d5c84dda6b66873a218a7e2703c..8db859cb8388a725441bcdf140e1d866ed0e744b 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dzubchikd@gmail.com>, 2012.
-#   <skoptev@ukr.net>, 2012.
-#   <volodya327@gmail.com>, 2012-2013.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Не вдалося завантажити список з App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Помилка автентифікації"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Не вдалося змінити зображене ім'я"
 
@@ -68,7 +68,7 @@ msgstr "Мова змінена"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "Помилковий запит"
+msgstr "Некоректний запит"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -120,52 +120,52 @@ msgstr "Помилка при оновленні програми"
 msgid "Updated"
 msgstr "Оновлено"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "Зберігаю..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "видалені"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "відмінити"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "Неможливо видалити користувача"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Адміністратор групи"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "додати групу"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "Потрібно задати вірне ім'я користувача"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "Помилка при створенні користувача"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "Потрібно задати вірний пароль"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -316,19 +316,19 @@ msgstr "Протокол"
 msgid "Log level"
 msgstr "Рівень протоколювання"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr "Отримати додатки для синхронізації ваш
 msgid "Show First Run Wizard again"
 msgstr "Показувати Майстер Налаштувань знову"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Пароль"
 
@@ -423,82 +423,74 @@ msgstr "Новий пароль"
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Показати Ім'я"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Ваше ім'я було змінене"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Неможливо змінити ваше зображене ім'я"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Змінити зображене ім'я"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Ваша адреса електронної пошти"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Введіть адресу електронної пошти для відновлення паролю"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Мова"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Ім'я Логіну"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Створити"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "сховище за замовчуванням"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Необмежено"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Інше"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Сховище"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "змінити зображене ім'я"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "встановити новий пароль"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "За замовчуванням"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index ef03d4d64b8bc26072e9554f27e2492930dc8e08..3be40699ea190ed18d5a24b97c66ef84f2b082cb 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <victor.dubiniuk@gmail.com>, 2012.
-#   <volodya327@gmail.com>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +17,10 @@ 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"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "Не вдалося видалити конфігурацію сервера"
@@ -56,281 +57,363 @@ msgstr "Зберегти налаштування ?"
 msgid "Cannot add server configuration"
 msgstr "Неможливо додати конфігурацію сервера"
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "Перевірка з'єднання завершилась неуспішно"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "Підтвердіть Видалення"
 
-#: templates/settings.php:8
+#: 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 "<b>Увага:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них."
 
-#: templates/settings.php:11
+#: 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 "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його."
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "Налаштування Сервера"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "Додати налаштування Сервера"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Хост"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Базовий DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "Один Base DN на одній строчці"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "DN Користувача"
 
-#: templates/settings.php:45
+#: 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 "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Фільтр Користувачів, що під'єднуються"
 
-#: templates/settings.php:53
+#: 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 "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Фільтр Списку Користувачів"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Фільтр Груп"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Визначає фільтр, який застосовується при отриманні груп."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Налаштування З'єднання"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "Налаштування Активне"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Якщо \"галочка\" знята, ця конфігурація буде пропущена."
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "Сервер для резервних копій"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера."
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Порт сервера для резервних копій"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Вимкнути Головний Сервер"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Коли увімкнуто, ownCloud  буде приєднуватись лише до сервера з резервними копіями."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Використовуйте TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Не використовуйте це додатково для під'єднання до LDAP, бо виконано не буде."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечутливий до регістру LDAP сервер (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Вимкнути перевірку SSL сертифіката."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендується, використовуйте лише для тестів."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "Час актуальності Кеша"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Зміна очищує кеш."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Налаштування Каталога"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Поле, яке відображає Ім'я Користувача"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Основне Дерево Користувачів"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "Один Користувач Base DN на одній строчці"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "Пошукові Атрибути Користувача"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Додатково; один атрибут на строчку"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Поле, яке відображає Ім'я Групи"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Основне Дерево Груп"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "Одна Група Base DN на одній строчці"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Пошукові Атрибути Групи"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Асоціація Група-Член"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Спеціальні Атрибути"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "Поле Квоти"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "Квота за замовчанням"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "Поле Ел. пошти"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "Правило іменування домашньої теки користувача"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Допомога"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index 59983e502099f5974ec80f20c12ccb5d97e385bc..feb00291cb71e04cf311444d840b339e27e1768f 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <skoptev@ukr.net>, 2012.
-#   <volodya327@gmail.com>, 2012.
-# пан Володимир <volodya327@gmail.com>, 2013.
+# skoptev <skoptev@ukr.net>, 2012
+# volodya327 <volodya327@gmail.com>, 2012
+# volodya327 <volodya327@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-19 00:05+0100\n"
-"PO-Revision-Date: 2013-02-18 16:40+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index df2a26e8af3b05c255844754db6f71b1512d8925..e5b6230d295a1a765185ae594005c4fc8f47e074 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# M. Adil Javed <adilone@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:30+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: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -161,75 +160,79 @@ msgstr "دسمبر"
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "منتخب کریں"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "منسوخ کریں"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "نہیں"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "ہاں"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "نہیں"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "اوکے"
 
@@ -294,7 +297,7 @@ msgstr "لنک کے ساتھ شئیر کریں"
 msgid "Password protect"
 msgstr "پاسورڈ سے محفوظ کریں"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "پاسورڈ"
 
@@ -397,24 +400,27 @@ msgstr "اون کلاؤڈ پاسورڈ ری سیٹ"
 msgid "Use the following link to reset your password: {link}"
 msgstr "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
-
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
+#: 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:8
-msgid "Request failed!"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: 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:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "ری سیٹ کی درخواست کریں"
 
@@ -520,37 +526,37 @@ msgstr "ایڈوانسڈ"
 msgid "Data folder"
 msgstr "ڈیٹا فولڈر"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "ڈیٹا بیس کونفگر کریں"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "ڈیٹابیس یوزر"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "ڈیٹابیس پاسورڈ"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "ڈیٹابیس کا نام"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "ڈیٹابیس ٹیبل سپیس"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "ڈیٹابیس ہوسٹ"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "سیٹ اپ ختم کریں"
 
@@ -558,37 +564,42 @@ msgstr "سیٹ اپ ختم کریں"
 msgid "web services under your control"
 msgstr "آپ کے اختیار میں ویب سروسیز"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "لاگ آؤٹ"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "یاد رکھیں"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "لاگ ان"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 437154841eda59c02783d6a3f7df9c0087abcae1..9b22814bc59f8f715d6a2e6ee6c9aa1ebb91b641 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:30+0000\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -78,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr ""
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -152,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "ایرر"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr ""
@@ -275,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr ""
+msgstr "شئیرنگ ختم کریں"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index d945e7ba70d2c255e196ae921791fddc6aa3a7a5..7db2a58d18ab47dd95ea4c6606bfaa7e86318e78 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.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-02-26 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,87 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index e9bdbedc1196fedbcb0bfee847746cbe6bd7029f..267556951c9491423a202943f97832b2f974dab7 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/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-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:421
+#: 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:424
+#: 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 ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index bf96aabc4599264666fbc4b39985918d407ed4df..a094fe6a21a49c2eb88742b5bf0b865e1125a76b 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/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-02-27 00:08+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,14 +35,14 @@ msgstr ""
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: 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 08c1f2bd3e1b17ba2f450b99514a41258f645ea4..528141e00bcb37f5f60c1b67701998f12e041984 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:30+0000\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "ایرر"
 
@@ -39,31 +39,31 @@ msgstr "ایرر"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_versions.po b/l10n/ur_PK/files_versions.po
index f2a9b38da54dc38e2301def533d722b59ef80b91..87f26d3039d1a65d364c2879b0d870f9f9ed8765 100644
--- a/l10n/ur_PK/files_versions.po
+++ b/l10n/ur_PK/files_versions.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -40,11 +40,11 @@ msgstr ""
 msgid "File %s could not be reverted to version %s"
 msgstr ""
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr ""
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr ""
 
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 128d7972a7ec6bdd00bbf86ffcd7d45d3ab75ddb..6470912a1ff9c04c44013d09f6b3822a72134efc 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "مدد"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "ذاتی"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "یوزرز"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "ایپز"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "ایڈمن"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index fc20d3d72829fffcbfc1a24ce9f038f48014d0e1..cf1c409dc70b830469bb8bf5a769b635e9d4489c 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:30+0000\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -116,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "پاسورڈ"
 
@@ -419,82 +423,74 @@ msgstr "نیا پاسورڈ"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 67a700b6057386b37f75e97af17d4b93e65513dc..43aba3ef53903416ae28548df373505c97d392e3 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-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:32
+#: 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:33
+#: templates/settings.php:47
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: templates/settings.php:36
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:40
+#: 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:41
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:72
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:59
+#: 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:60
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:64
+#: 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:64
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:65
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:67
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:72
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:73
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:79
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:86
+#: 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:86
+#: templates/settings.php:111
 msgid "Help"
 msgstr "مدد"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index 31e16092c8873380144f103e83ca3d8388cc373c..3082e6561fc97f1b82879dc67ff10b3c55f39f85 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/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-02-26 00:04+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 7c716b72bd55adfa5d1d580dac7e26e08f912a91..b1a7295fba70bc961dbe555b12fcd21e1e0e0d26 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <khanhnd@kenhgiaiphap.vn>, 2012.
-#   <mattheu.9x@gmail.com>, 2012.
-#   <mattheu_9x@yahoo.com>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# Son Nguyen <sonnghit@gmail.com>, 2012.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012-2013.
+# xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +74,7 @@ msgstr "Lỗi thêm %s vào mục yêu thích."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Không có thể loại nào được chọn để xóa."
+msgstr "Bạn chưa chọn mục để xóa"
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -166,75 +161,79 @@ msgstr "Tháng 12"
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 phút trước"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} phút trước"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1 giờ trước"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} giờ trước"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} ngày trước"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} tháng trước"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "năm trước"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "Chọn"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Hủy"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "Không"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Có"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "Không"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Đồng ý"
 
@@ -299,7 +298,7 @@ msgstr "Chia sẻ với liên kết"
 msgid "Password protect"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -337,7 +336,7 @@ msgstr "Đã được chia sẽ trong {item} với {user}"
 
 #: js/share.js:308
 msgid "Unshare"
-msgstr "Gỡ bỏ chia sẻ"
+msgstr "Bỏ chia sẻ"
 
 #: js/share.js:320
 msgid "can edit"
@@ -402,24 +401,27 @@ msgstr "Khôi phục mật khẩu Owncloud "
 msgid "Use the following link to reset your password: {link}"
 msgstr "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
+#: 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 "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống."
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "Thiết lập lại email gởi."
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "Yêu cầu  của bạn không thành công !"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
-msgstr "Tên người dùng"
+msgstr "Tên đăng nhập"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "Yêu cầu thiết lập lại "
 
@@ -445,7 +447,7 @@ msgstr "Cá nhân"
 
 #: strings.php:6
 msgid "Users"
-msgstr "Người sử dụng"
+msgstr "Người dùng"
 
 #: strings.php:7
 msgid "Apps"
@@ -469,7 +471,7 @@ msgstr "Không tìm thấy Clound"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
-msgstr "Sửa thể loại"
+msgstr "Sửa chuyên mục"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
@@ -482,11 +484,11 @@ msgstr "Cảnh bảo bảo mật"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Vui lòng cập nhật bản cài đặt PHP để sử dụng ownCloud một cách an toàn."
 
 #: templates/installation.php:32
 msgid ""
@@ -525,75 +527,80 @@ msgstr "Nâng cao"
 msgid "Data folder"
 msgstr "Thư mục dữ liệu"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "Cấu hình cơ sở dữ liệu"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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 "được sử dụng"
 
-#: templates/installation.php:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "Người dùng cơ sở dữ liệu"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "Mật khẩu cơ sở dữ liệu"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "Tên cơ sở dữ liệu"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "Cơ sở dữ liệu tablespace"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "các dịch vụ web dưới sự kiểm soát của bạn"
+msgstr "dịch vụ web dưới sự kiểm soát của bạn"
+
+#: templates/layout.user.php:37
+#, 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:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "Tự động đăng nhập đã bị từ chối !"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa."
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "ghi nhá»›"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "Đăng nhập khác"
 
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 6661db587b9a261a6a851f1163fc00e6cd57632d..8bdcaa0c0f7f1dd05e3e0e32d9a132e30e8b4831 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,17 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <khanhnd@kenhgiaiphap.vn>, 2012.
-#   <mattheu.9x@gmail.com>, 2012.
-#   <mattheu_9x@yahoo.com>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
+# xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +21,13 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Không thể di chuyển %s - Đã có tên file này trên hệ thống"
+msgstr "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
 msgstr "Không thể di chuyển %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "Không thể đổi tên file"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "Không có tập tin nào được tải lên. Lỗi không xác định"
@@ -53,15 +45,15 @@ msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini:
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định"
+msgstr "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "Tập tin tải lên mới chỉ tải lên được một phần"
+msgstr "Các tập tin được tải lên chỉ tải lên được một phần"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "Không có tập tin nào được tải lên"
+msgstr "Chưa có file nào được tải lên"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -83,57 +75,61 @@ msgstr "Thư mục không hợp lệ"
 msgid "Files"
 msgstr "Tập tin"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Chia sẻ"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "Sửa tên"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Chờ"
+msgstr "Đang chờ"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} đã tồn tại"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "thay thế"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "tên gợi ý"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "đã thay thế {new_name} bằng {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "thực hiện việc xóa"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 tệp tin đang được tải lên"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "tệp tin đang được tải lên"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -157,69 +153,77 @@ msgstr "Your storage is full, files can not be updated or synced anymore!"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte"
+msgstr "Không thể tải lên tập tin của bạn ,nó như là một thư mục hoặc có 0 byte"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Không đủ chỗ trống cần thiết"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL không được để trống."
 
-#: js/files.js:486
+#: js/files.js:491
 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:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} tập tin"
 
+#: 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 "Không thể đổi tên file"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "Tải lên"
@@ -280,40 +284,40 @@ msgstr "File đã bị xóa"
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Bạn không có quyền ghi vào đây."
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
-msgstr "Tải xuống"
+msgstr "Tải về"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "Không chia sẽ"
+msgstr "Bỏ chia sẻ"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ."
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "Upgrading filesystem cache..."
+msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index af199ade990ade7f5cff1fc86c3df75d73c53743..b364dc18140262cb3a3f4ee4c61ab5bd5aa10612 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -19,22 +17,87 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Đang lưu..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Mã hóa"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "Mã hóa file đã mở"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "Loại file sau sẽ không được mã hóa"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "Việc mã hóa không bao gồm loại file sau"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "Không có gì hết"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index b26197d819fe76e5c87b2acba9b432e102c01ea2..492533621477eae85e6f9495116218c2d4a86b08 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mattheu_9x@yahoo.com>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
+# xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -40,19 +38,26 @@ msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã b
 msgid "Error configuring Google Drive storage"
 msgstr "Lỗi cấu hình lưu trữ Google Drive"
 
-#: lib/config.php:423
+#: 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 "<b>Cảnh báo:</b> \"smbclient\" chưa được cài đặt. Mount CIFS/SMB shares là không thể thực hiện được. Hãy hỏi người quản trị hệ thống để cài đặt nó."
 
-#: lib/config.php:426
+#: 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 "<b>Cảnh báo:</b> FTP trong PHP chưa được cài đặt hoặc chưa được  mở. Mount FTP shares là không thể. Xin hãy yêu cầu quản trị hệ thống của bạn cài đặt nó."
 
+#: 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 "<b>Cảnh báo:</b> Tính năng Curl trong PHP chưa được kích hoạt hoặc cài đặt. Việc gắn kết ownCloud / WebDAV hay GoogleDrive không thực hiện được. Vui lòng liên hệ người quản trị để cài đặt nó."
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Lưu trữ ngoài"
@@ -63,7 +68,7 @@ msgstr "Tên thư mục"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "Lưu trữ ngoài"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -79,7 +84,7 @@ msgstr "Áp dụng"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "Thêm bộ nhớ"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 792d5fe671bf98c556ffa6daec0a230de5975eb7..417f805494172d4cf252c2d8ed443781b5490957 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mattheu_9x@yahoo.com>, 2012.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 04:39+0000\n"
-"Last-Translator: SÆ¡n Nguyá»…n <sonnghit@gmail.com>\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"
 "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"
@@ -27,24 +25,24 @@ msgstr "Mật khẩu"
 msgid "Submit"
 msgstr "Xác nhận"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s đã chia sẻ thư mục %s với bạn"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s đã chia sẻ tập tin %s với bạn"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "Không có xem trước cho"
 
-#: templates/public.php:35
+#: 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 3a57c2b1c0ed2943dd0f447c17b105ba5bc803dd..0a195d4c7eb17f541ff40a7f8c60615d35f1bec9 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# sao sang <saosangmo@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "Không thể óa %s vĩnh viễn"
 msgid "Couldn't restore %s"
 msgstr "Không thể khôi phục %s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "thực hiện phục hồi"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -40,31 +39,31 @@ msgstr "Lá»—i"
 msgid "delete file permanently"
 msgstr "xóa file vĩnh viễn"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "Xóa vĩnh vễn"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "Tên"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} tập tin"
 
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index df14039e1148212bab582cd8b68a65a2ac0f59fe..ddb86932e17190f540ffd72a503e907f19a1e2e3 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <khanhnd@kenhgiaiphap.vn>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -43,17 +40,17 @@ msgstr "Thất bại"
 msgid "File %s could not be reverted to version %s"
 msgstr "File %s không thể khôi phục về phiên bản %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Không có phiên bản cũ nào"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Không chỉ ra đường dẫn rõ ràng"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Phiên bản"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index cf168b55ae11d255f430157cc6ca249badde826d..5ad481d093efa00d77461e7522c2dd39c52db4f3 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -3,16 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mattheu.9x@gmail.com>, 2012.
-#   <mattheu_9x@yahoo.com>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -21,47 +17,47 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "Người dùng"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "Ứng dụng"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "Quản trị"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "Tải về ZIP đã bị tắt."
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "Tập tin cần phải được tải về từng người một."
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "Trở lại tập tin"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "không thể phát hiện được"
 
@@ -79,7 +75,7 @@ msgstr "Mã Token đã hết hạn. Hãy tải lại trang."
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
-msgstr "Các tập tin"
+msgstr "Tập tin"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
@@ -97,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -121,79 +113,83 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "1 giây trước"
+msgstr "vài giây trước"
 
 #: template.php:114
 msgid "1 minute ago"
@@ -243,19 +239,6 @@ msgstr "năm trước"
 msgid "years ago"
 msgstr "năm trước"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s có sẵn.  <a href=\"%s\">xem thêm ở đây</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "đến ngày"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "đã TĂT chức năng cập nhật "
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 5fe54cdb368541c1e120d96e773cd59399a07e39..f966fbdc43459462248529ae4d9b6527ac5995ce 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -3,19 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <khanhnd@kenhgiaiphap.vn>, 2012.
-#   <mattheu.9x@gmail.com>, 2012.
-#   <mattheu_9x@yahoo.com>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# Son Nguyen <sonnghit@gmail.com>, 2012.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
-#   <vlinhd11@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -28,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Không thể tải danh sách ứng dụng từ App Store"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "Lỗi xác thực"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "Không thể thay đổi tên hiển thị"
 
@@ -123,52 +120,52 @@ msgstr "Lỗi khi cập nhật ứng dụng"
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "Đang tiến hành lưu ..."
+msgstr "Đang lưu..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "đã xóa"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "lùi lại"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "Nhóm"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "Nhóm quản trị"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
@@ -238,59 +235,59 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Thực thi tác vụ mỗi khi trang được tải"
 
 #: 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 đã được đăng ký tại một dịch vụ webcron. Gọi trang cron.php mỗi phút một lần thông qua giao thức http."
 
 #: 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 "Sử dụng dịch vụ cron của hệ thống. Gọi tệp tin cron.php mỗi phút một lần."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Chia sẻ"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Bật chia sẻ API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Cho phép liên kết"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Cho phép chia sẻ lại"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
 
 #: templates/admin.php:168
 msgid "Security"
@@ -313,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -402,7 +399,7 @@ msgstr "Nhận ứng dụng để đồng bộ file của bạn"
 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:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -420,88 +417,80 @@ msgstr "Mật khẩu cũ"
 
 #: templates/personal.php:42
 msgid "New password"
-msgstr "Mật khẩu mới "
+msgstr "Mật khẩu mới"
 
 #: templates/personal.php:44
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "Tên hiển thị của bạn đã được thay đổi"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "Không thể thay đổi tên hiển thị của bạn"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "Thay đổi tên hiển thị"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "Email của bạn"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 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:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 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:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "Tên đăng nhập"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "Tạo"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "Bộ nhớ mặc định"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "Không giới hạn"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "Bá»™ nhá»›"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "Thay đổi tên hiển thị"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "đặt mật khẩu mới"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index b74bd68ddc10f813cdcb3291300d4830ffbeff8e..6bcc06b555706bb050a33e04c42149bfbb957b12 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -3,15 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <mattheu_9x@yahoo.com>, 2012.
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +17,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -56,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr "Thành công"
+
+#: js/settings.js:117
+msgid "Error"
+msgstr "Lá»—i"
+
+#: js/settings.js:141
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "Máy chủ"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "DN cơ bản"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "Người dùng DN"
 
-#: templates/settings.php:45
+#: 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 "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống."
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống."
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "Lọc người dùng đăng nhập"
 
-#: templates/settings.php:53
+#: 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 "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "Lọc danh sách thành viên"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "Bộ lọc nhóm"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "Connection Settings"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "Cổng sao lưu (Replica)"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "Tắt máy chủ chính"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "When switched on, ownCloud will only connect to the replica server."
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "Sử dụng TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "Do not use it additionally for LDAPS connections, it will fail."
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "Tắt xác thực chứng nhận SSL"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL  trong máy chủ ownCloud của bạn."
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "Directory Settings"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "Hiển thị tên người sử dụng"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud."
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "Cây người dùng cơ bản"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "User Search Attributes"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "Optional; one attribute per line"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "Hiển thị tên nhóm"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud."
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "Cây nhóm cơ bản"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "Group Search Attributes"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "Nhóm thành viên Cộng đồng"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "Giúp đỡ"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 57c796e00db20b026f43e25794eaf661b5c80f1c..e3cb6494d123096ff6eca9cc503b2b0f6a9834d2 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# sao sang <saosangmo@yahoo.com>, 2013.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
+# saosangm <saosangmo@yahoo.com>, 2013
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 18:30+0000\n"
-"Last-Translator: saosangm <saosangmo@yahoo.com>\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"
 "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"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index c9afe154bc9aecf8d62c15be4348fd4c2a14c923..b8ee6a618ff687f1da8a2960577ebb5a5fc9d655 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bluehattree@126.com>, 2012.
-# HO Gin Wang <kopisee@qq.com>, 2013.
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: kopisee <kopisee@qq.com>\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: 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"
@@ -76,7 +73,7 @@ msgstr ""
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "没有选者要删除的分类."
+msgstr "没有选中要删除的分类。"
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
@@ -163,75 +160,79 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours}小时前"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months}月前"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "选择"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "否"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "否"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "好的"
 
@@ -246,7 +247,7 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
 #: js/share.js:589
 msgid "Error"
-msgstr "错误"
+msgstr "出错"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -296,7 +297,7 @@ msgstr "分享链接"
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
@@ -399,24 +400,27 @@ msgstr "私有云密码重置"
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用下面的链接来重置你的密码:{link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "重置邮件已发送。"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "请求失败！"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "你将会收到一个重置密码的链接"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "要求重置"
 
@@ -438,7 +442,7 @@ msgstr "重置密码"
 
 #: strings.php:5
 msgid "Personal"
-msgstr "个人的"
+msgstr "私人"
 
 #: strings.php:6
 msgid "Users"
@@ -446,11 +450,11 @@ msgstr "用户"
 
 #: strings.php:7
 msgid "Apps"
-msgstr "应用程序"
+msgstr "程序"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "管理"
+msgstr "管理员"
 
 #: strings.php:9
 msgid "Help"
@@ -522,75 +526,80 @@ msgstr "进阶"
 msgid "Data folder"
 msgstr "数据存放文件夹"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "数据库用户名"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "数据库表格空间"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "完成安装"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "你控制下的网络服务"
+msgstr "您控制的网络服务"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "注销"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自动登录被拒绝！"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "如果您最近没有修改您的密码，那您的帐号可能被攻击了！"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "请修改您的密码以保护账户。"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "忘记密码?"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "备忘"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "登陆"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "备选登录"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index e3c99fef5de81100b5e56057a568842c0094437c..993200578185e9c385af2bf51e588ac0f705e3c8 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bluehattree@126.com>, 2012.
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -29,17 +27,13 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "没有任何错误,文件上传成功了"
+msgstr "文件上传成功"
 
 #: ajax/upload.php:27
 msgid ""
@@ -50,19 +44,19 @@ msgstr ""
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "上传的文件超过了HTML表单指定的MAX_FILE_SIZE"
+msgstr "上传的文件超过了 HTML 表格中指定的 MAX_FILE_SIZE 选项"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "文件只有部分被上传"
+msgstr "文件部分上传"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "没有上传完成的文件"
+msgstr "没有上传文件"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "丢失了一个临时文件夹"
+msgstr "缺失临时文件夹"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -80,57 +74,61 @@ msgstr ""
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "分享"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "删除"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "Pending"
+msgstr "等待中"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "推荐名称"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "已用 {old_name} 替换 {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 个文件正在上传"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "个文件正在上传"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -154,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
+msgstr "不能上传您的文件，由于它是文件夹或者为空文件"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传。关闭页面会取消上传。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "网址不能为空。"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "出错"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
-msgstr "名字"
+msgstr "名称"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} 个文件"
 
+#: 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 "上传"
@@ -277,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "这里没有东西.上传点什么!"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "取消共享"
+msgstr "取消分享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
-msgstr "上传的文件太大了"
+msgstr "上传过大"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "正在扫描文件,请稍候."
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "正在扫描"
 
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 262bed13b5928d8f3139e8d10f84cf8bf4568cd2..d98fa3d78b4c7cf637e04c8b0e403f95f47335d0 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-10 00:08+0100\n"
-"PO-Revision-Date: 2013-02-09 23:09+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "保存中..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "æ— "
+#: templates/settings-personal.php:28
+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 59e250242196f993fb0feb053ab3005cef9574b2..ab7f4988e19740ae77a51239973ac032e2a9cf4a 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# HO Gin Wang <kopisee@qq.com>, 2013.
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-06 21:20+0000\n"
-"Last-Translator: kopisee <kopisee@qq.com>\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"
 "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"
@@ -39,19 +37,26 @@ msgstr "请提供一个有效的 Dropbox app key 和 secret。"
 msgid "Error configuring Google Drive storage"
 msgstr "配置 Google Drive 存储失败"
 
-#: lib/config.php:424
+#: 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 "<b>注意：</b>“SMB客户端”未安装。CIFS/SMB分享不可用。请向您的系统管理员请求安装该客户端。"
 
-#: lib/config.php:427
+#: 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 "<b>注意：</b>PHP的FTP支持尚未启用或未安装。FTP分享不可用。请向您的系统管理员请求安装。"
 
+#: 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 "外部存储"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index a25727470d6e4b3cd042abdd622ff9ee9de36af8..a05eaaf358814c7894330cb0648a3171633d6b17 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 23:45+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "密码"
 msgid "Submit"
 msgstr "提交"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s 与您分享了文件夹 %s"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s 与您分享了文件 %s"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "下载"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "没有预览可用于"
 
-#: templates/public.php:35
+#: 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 ae46e1b0c3a6f71422d8d31f061b5c2807052093..66526ba07455fe76c65cc60934c61257e1c9a1f1 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "出错"
 
@@ -39,31 +39,31 @@ msgstr "出错"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index d91537b916b5d3b489de0a422ec8d1d1ac3155ee..c1ffcfb75c3dab5151c2d431feb2c4d8a1131d9d 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# HO Gin Wang <kopisee@qq.com>, 2013.
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-06 21:00+0000\n"
-"Last-Translator: kopisee <kopisee@qq.com>\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"
 "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"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 65f7a8c6ceeee0ae6fd786e3699b0cb19e716aff..8cad55358429edc5e619eabd115f2adba00e883f 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-08 02:12+0200\n"
-"PO-Revision-Date: 2013-04-06 22:30+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: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +17,47 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "私人"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "用户"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "程序"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "管理员"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已关闭"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐个下载文件。"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "返回到文件"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大而不能生成 zip 文件。"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -94,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -118,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请双击<a href='%s'>安装向导</a>。"
@@ -240,19 +239,6 @@ msgstr "去年"
 msgid "years ago"
 msgstr "年前"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s 不可用。获知 <a href=\"%s\">详情</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "最新"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "更新检测已禁用"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index d84e4e89423abd3c0cd4141a4f9ad8ce68c5db42..dcff59eda7923a1e9337bbbc16acfeab1a40563b 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <bluehattree@126.com>, 2012.
-# HO Gin Wang <kopisee@qq.com>, 2013.
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: kopisee <kopisee@qq.com>\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"
 "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"
@@ -24,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "不能从App Store 中加载列表"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "认证错误"
+msgstr "验证错误"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "无法更改显示名称"
 
@@ -119,52 +120,52 @@ msgstr "应用升级时出现错误"
 msgid "Updated"
 msgstr "已升级"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "保存中..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "删除"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "撤销"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
-msgstr "组"
+msgstr "群组"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "群组管理员"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "添加群组"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "请填写有效用户名"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "新增用户时出现错误"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "请填写有效密码"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "Chinese"
 
@@ -238,23 +239,23 @@ msgstr "Cron"
 
 #: 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 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 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"
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "分享"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
@@ -309,25 +310,25 @@ msgstr ""
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "日志"
 
 #: templates/admin.php:196
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -398,7 +399,7 @@ msgstr "获取应用并同步您的文件"
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "密码"
 
@@ -422,82 +423,74 @@ msgstr "新密码"
 msgid "Change password"
 msgstr "改变密码"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "显示名称"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "您的显示名称已修改"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "无法修改您的显示名称"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "更改显示名称"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "Email"
+msgstr "电子邮件"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "你的email地址"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "输入一个邮箱地址以激活密码恢复功能"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "使用此地址来在您的文件管理器中连接您的ownCloud"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "登录名"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "新建"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "默认容量"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "无限制"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
-msgstr "其他的"
+msgstr "其他"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "容量"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "更改显示名称"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "设置新的密码"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "默认"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index e3448eda1cc64e870d23334b8bc9c1c0c9254241..6b36fb523b1f6d202737bfb1aebbaea78e464ece 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "基本判别名"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "用户判别名"
 
-#: templates/settings.php:45
+#: 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 "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "用户登录过滤器"
 
-#: templates/settings.php:53
+#: 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 "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "用户列表过滤器"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义撷取用户时要应用的过滤器。"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "不能使用占位符，例如 \"objectClass=person\"。"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "群组过滤器"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义撷取群组时要应用的过滤器"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。"
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "关闭 SSL 证书校验。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "不推荐，仅供测试"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改会清空缓存。"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "基本用户树"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "群组显示名称字段"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "基本群组树"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "群组-成员组合"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "以字节计"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index e9984fbe007c063b9d72d5bb88d563326fe24caa..60e0c7b04498c5a127c865bf555dc601d02b0a04 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 706b244ae54d6e3c0d1ce218a235f321f7a189af..0672342d8386972ba192d4e732ecee63e15457a6 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# Phoenix Nemo <>, 2012.
-#  <rainofchaos@gmail.com>, 2013.
-#   <suiy02@gmail.com>, 2012.
-#  <wengxt@gmail.com>, 2013.
-#   <wengxt@gmail.com>, 2011, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,75 +161,79 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "一分钟前"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr "1小时前"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} 小时前"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} 月前"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "年前"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "否"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr "加载文件选择器模板出错"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "是"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "否"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "好"
 
@@ -266,7 +264,7 @@ msgstr "已共享"
 
 #: js/share.js:90
 msgid "Share"
-msgstr "共享"
+msgstr "分享"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
@@ -290,7 +288,7 @@ msgstr " {owner}与您共享"
 
 #: js/share.js:159
 msgid "Share with"
-msgstr "共享"
+msgstr "分享之"
 
 #: js/share.js:164
 msgid "Share with link"
@@ -300,7 +298,7 @@ msgstr "共享链接"
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
@@ -403,24 +401,27 @@ msgstr "重置 ownCloud 密码"
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用以下链接重置您的密码：{link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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 "重置密码的链接已发送到您的邮箱。<br>如果您觉得在合理的时间内还未收到邮件，请查看 spam/junk 目录。<br>如果没有在那里，请询问您的本地管理员。"
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "重置邮件已发送。"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "请求失败！"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "您将会收到包含可以重置密码链接的邮件。"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "请求重置"
 
@@ -454,7 +455,7 @@ msgstr "应用"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "管理员"
+msgstr "管理"
 
 #: strings.php:9
 msgid "Help"
@@ -474,7 +475,7 @@ msgstr "编辑分类"
 
 #: templates/edit_categories_dialog.php:16
 msgid "Add"
-msgstr "添加"
+msgstr "增加"
 
 #: templates/installation.php:24 templates/installation.php:31
 #: templates/installation.php:38
@@ -483,11 +484,11 @@ msgstr "安全警告"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "为保证安全使用 ownCloud 请更新您的PHP。"
 
 #: templates/installation.php:32
 msgid ""
@@ -526,75 +527,80 @@ msgstr "高级"
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "数据库表空间"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "安装完成"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "由您掌控的网络服务"
+msgstr "您控制的web服务"
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "注销"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自动登录被拒绝！"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "如果您没有最近修改您的密码，您的帐户可能会受到影响！"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "请修改您的密码，以保护您的账户安全。"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
-msgstr ""
+msgstr "记住"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 01d92183301061bb3286465e833b8f365384d1e8..a46d71b023ab5f9e8cd41fcd33e1c406b08a3eaa 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,20 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
-#   <rainofchaos@gmail.com>, 2012.
-#   <suiy02@gmail.com>, 2012.
-#  <wengxt@gmail.com>, 2013.
-#   <wengxt@gmail.com>, 2011, 2012.
+# 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-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -34,17 +28,13 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-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 "没有发生错误，文件上传成功。"
+msgstr "文件上传成功，没有错误发生"
 
 #: ajax/upload.php:27
 msgid ""
@@ -55,15 +45,15 @@ msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "上传的文件超过了在HTML 表单中指定的MAX_FILE_SIZE"
+msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
 
 #: ajax/upload.php:30
 msgid "The uploaded file was only partially uploaded"
-msgstr "只上传了文件的一部分"
+msgstr "已上传文件只上传了部分（不完整）"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "文件没有上传"
+msgstr "没有文件被上传"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
@@ -85,57 +75,61 @@ msgstr "无效文件夹。"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "分享"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "删除"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
-msgstr "操作等待中"
+msgstr "等待"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "进行删除操作"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "文件上传中"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -159,69 +153,77 @@ msgstr "您的存储空间已满，文件将无法更新或同步！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
+msgstr "无法上传您的文件，文件夹或者空文件"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "没有足够可用空间"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr "URL不能为空"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "错误"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} 个文件"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "无法重命名文件"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上传"
@@ -282,37 +284,37 @@ msgstr "删除文件"
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr "您没有写权限"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
-msgstr "取消分享"
+msgstr "取消共享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "当前扫描"
 
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 1807d6a5f3993201cc747f91ecca471c790eccd7..11cd8aa05f3edcf72a17c0bc24791a3298f15bf8 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# CyberCowBoy <ccb3275@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-15 00:05+0100\n"
-"PO-Revision-Date: 2013-03-14 08:40+0000\n"
-"Last-Translator: ccb <ccb3275@gmail.com>\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"
 "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,22 +17,87 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "保存中"
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "文件加密已启用."
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "如下的文件类型将不会被加密:"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "从加密中排除如下的文件类型:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "æ— "
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index f942b1847552be801037498a59adf7b7c1f60a15..20aae7c898fc73770597928314db9f29792f6a76 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\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"
 "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"
@@ -40,19 +37,26 @@ msgstr "请提供有效的Dropbox应用key和secret"
 msgid "Error configuring Google Drive storage"
 msgstr "配置Google Drive存储时出错"
 
-#: lib/config.php:423
+#: 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 "<b>警告：</b>“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。"
 
-#: lib/config.php:426
+#: 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 "<b>警告：</b>PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。"
 
+#: 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 "<b>警告：</b> PHP中未启用或未安装Curl支持。ownCloud / WebDAV 或 GoogleDrive 不能挂载。请请求您的系统管理员安装该它。"
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "外部存储"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 149353d11006059e2ec890adff4b9608b6ca1fff..35fda472ffd0bf1011c695f92be5799ee45a5da7 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <suiy02@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 02:02+0200\n"
-"PO-Revision-Date: 2012-09-27 14:41+0000\n"
-"Last-Translator: waterone <suiy02@gmail.com>\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"
 "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"
@@ -26,24 +25,24 @@ msgstr "密码"
 msgid "Submit"
 msgstr "提交"
 
-#: templates/public.php:9
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s与您共享了%s文件夹"
 
-#: templates/public.php:11
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s与您共享了%s文件"
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "下载"
 
-#: templates/public.php:29
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "没有预览"
 
-#: templates/public.php:37
+#: 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 8a6a3581afc31ee84a3b841524dd410bee214604..e2735ae9035cc6f986be6d6ee7a38f11cc8bc77e 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# CyberCowBoy <ccb3275@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +27,11 @@ msgstr "无法彻底删除文件%s"
 msgid "Couldn't restore %s"
 msgstr "无法恢复%s"
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "执行恢复操作"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "错误"
 
@@ -40,31 +39,31 @@ msgstr "错误"
 msgid "delete file permanently"
 msgstr "彻底删除文件"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "已删除"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index ada0de78abe97259dca52d068e8f097c0f43975e..cc566f1c466708570f2e8bf1464ce60bf366a428 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-#  <cn.leoyang@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-02 00:03+0100\n"
-"PO-Revision-Date: 2013-03-01 09:00+0000\n"
-"Last-Translator: bzdk <cn.leoyang@gmail.com>\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"
 "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"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 18d284576a11433277225dde23b6ecce05e6c145..60ee064c1fbabddfdd9b140682c9b4bbe714d058 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,16 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
-#   <rainofchaos@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\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: 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,47 +17,47 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "个人"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "用户"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "应用"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大，无法生成 zip 文件。"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "无法确定"
 
@@ -96,10 +93,6 @@ msgstr "请设置一个管理员用户名。"
 msgid "Set an admin password."
 msgstr "请设置一个管理员密码。"
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr "请指定一个数据目录。"
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -120,83 +113,87 @@ msgstr "%s 您不能在数据库名称中使用英文句号。"
 msgid "%s set the database host."
 msgstr "%s 设置数据库所在主机。"
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL 数据库用户名和/或密码无效"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle 数据库用户名和/或密码无效"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL 数据库用户名和/或密码无效"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "数据库错误：\"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "冲突命令为：\"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL 用户 '%s'@'%%' 已存在"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle 数据库用户名和/或密码无效"
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "冲突命令为：\"%s\"，名称：%s，密码：%s"
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 用户名和/或密码无效：%s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
 #: template.php:113
 msgid "seconds ago"
-msgstr "几秒前"
+msgstr "秒前"
 
 #: template.php:114
 msgid "1 minute ago"
-msgstr "1分钟前"
+msgstr "一分钟前"
 
 #: template.php:115
 #, php-format
@@ -240,20 +237,7 @@ msgstr "去年"
 
 #: template.php:124
 msgid "years ago"
-msgstr "几年前"
-
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s 已存在。点此 <a href=\"%s\">获取更多信息</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "已更新。"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "更新检查功能被禁用。"
+msgstr "年前"
 
 #: vcategories.php:188 vcategories.php:249
 #, php-format
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9e74b665917f0a36f646d3607a9b85d53510f14f..bf5e386cd3b2cc416c8aeb368f8db52b5344738b 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,20 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# CyberCowBoy <ccb3275@gmail.com>, 2013.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012-2013.
-# Phoenix Nemo <>, 2012.
-#   <rainofchaos@gmail.com>, 2012.
-#   <suiy02@gmail.com>, 2012.
-#  <wengxt@gmail.com>, 2013.
-#   <wengxt@gmail.com>, 2011, 2012.
+# 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -29,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
-msgstr "认证错误"
+msgstr "认证出错"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "您的显示名字已经改变"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "无法修改显示名称"
 
@@ -72,7 +69,7 @@ msgstr "语言已修改"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr "非法请求"
+msgstr "无效请求"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -102,7 +99,7 @@ msgstr "禁用"
 
 #: js/apps.js:36 js/apps.js:64 js/apps.js:83
 msgid "Enable"
-msgstr "启用"
+msgstr "开启"
 
 #: js/apps.js:55
 msgid "Please wait...."
@@ -124,52 +121,52 @@ msgstr "更新 app 时出错"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
-msgstr "正在保存"
+msgstr "保存中"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "已经删除"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "撤销"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "组"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "组管理员"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "添加组"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "必须提供合法的用户名"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "创建用户出错"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -320,19 +317,19 @@ msgstr "日志"
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -403,7 +400,7 @@ msgstr "安装应用进行文件同步"
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "密码"
 
@@ -427,82 +424,74 @@ msgstr "新密码"
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "显示名称"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "您的显示名称已修改"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "无法修改您的显示名称"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "修改显示名称"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "填写电子邮件地址以启用密码恢复功能"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "用该地址来连接文件管理器中的 ownCloud"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "登录名称"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr "创建"
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "默认存储"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "无限"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "存储"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "修改显示名称"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "设置新密码"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index baa62ccec8b3561e3a53ad746b4828af150aeb5d..cad853206bb5d04fa59cc484b072820dfc9118df 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\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"
 "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,6 +17,10 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr "未能删除服务器配置"
@@ -55,281 +57,363 @@ msgstr "保留设置吗？"
 msgid "Cannot add server configuration"
 msgstr "无法添加服务器配置"
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr "连接测试失败"
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的想要删除当前服务器配置吗？"
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
-#: templates/settings.php:8
+#: 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 "<b>警告：</b>应用 user_ldap 和 user_webdavauth 不兼容。您可能遭遇未预料的行为。请垂询您的系统管理员禁用其中一个。"
 
-#: templates/settings.php:11
+#: 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 "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。"
 
-#: templates/settings.php:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr "服务器配置"
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr "添加服务器配置"
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头"
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr "每行一个基本判别名"
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡里为用户和组指定Base DN"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:45
+#: 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 "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "启用匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr "用户登录过滤"
 
-#: templates/settings.php:53
+#: 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 "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid作为占位符，例如“uid=%%uid”"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr "用户列表过滤"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义拉取用户时的过滤器"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "没有任何占位符,如 \"objectClass=person\"."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr "组过滤"
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义拉取组信息时的过滤器"
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "无需占位符，例如\"objectClass=posixGroup\""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr "连接设置"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr "现行配置"
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr "当反选后，此配置将被忽略。"
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr "备份 (镜像) 主机"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
 
-#: templates/settings.php:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr "备份 (镜像) 端口"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr "禁用主服务器"
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "当开启后，ownCloud 将仅连接到镜像服务器。"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "对于 LDAPS 连接不要额外启用它，连接必然失败。"
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr "暂不推荐，仅供测试"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr "缓存存活时间"
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改将清空缓存。"
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr "目录设置"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用来生成用户的ownCloud名称的 LDAP属性"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr "每行一个用户基准判别名"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr "用户搜索属性"
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr "可选;每行一个属性"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用来生成组的ownCloud名称的LDAP属性"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr "每行一个群组基准判别名"
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr "群组搜索属性"
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index a642c9b21d8e34fd1c856497463abaee7651d780..82c49c2fbc26aad0a61e865da8e4e44e72f9cf2a 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
-# marguerite su <i@marguerite.su>, 2013.
-#  <wengxt@gmail.com>, 2013.
+# hanfeng <appweb.cn@gmail.com>, 2012
+# Dianjin Wang <1132321739qq@gmail.com>, 2012
+# marguerite su <i@marguerite.su>, 2013
+# Xuetian Weng <wengxt@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-23 00:05+0100\n"
-"PO-Revision-Date: 2013-01-21 23:23+0000\n"
-"Last-Translator: Xuetian Weng <wengxt@gmail.com>\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"
 "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"
@@ -29,7 +29,7 @@ msgstr "WebDAV 认证"
 msgid "URL: http://"
 msgstr "URL：http://"
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 8050a6cf0e1ddb6d08174edeea9dbf2945c7ba8c..44746cd953a71bb27909cb2daed0e20dc5078658 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <amanda.shuuemura@gmail.com>, 2012.
-# Dennis <dtsang29@hotmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -162,75 +160,79 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "前一月"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "個月之前"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr ""
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Yes"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "No"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -295,7 +297,7 @@ msgstr "以連結分享"
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密碼"
 
@@ -398,24 +400,27 @@ msgstr ""
 msgid "Use the following link to reset your password: {link}"
 msgstr "請用以下連結重設你的密碼: {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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:5
-msgid "Reset email send."
-msgstr "重設密碼郵件已傳"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "請求失敗"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "你將收到一封電郵"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "用戶名稱"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "重設"
 
@@ -521,37 +526,37 @@ msgstr "進階"
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "資料庫帳戶"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr ""
 
@@ -559,37 +564,42 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "登出"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自動登入被拒"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "如果你近期未曾更改密碼, 你的帳號可能被洩露!"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr "請更改你的密碼以保護你的帳戶"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "忘記密碼"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr ""
 
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 1b5ca2bcccff5a374a422df22545e9da8b2d6381..b90c1a88c2ce8d2138b379c76bd70f2dd98b2a19 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <amanda.shuuemura@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:09+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -28,10 +27,6 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr ""
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr ""
@@ -79,55 +74,59 @@ msgstr ""
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "分享"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "刪除"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr ""
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr ""
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr ""
 
@@ -153,69 +152,77 @@ msgstr ""
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr ""
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{}文件夾"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr ""
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上傳"
@@ -276,37 +283,37 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消分享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:110
+#: 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:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index c1002a17a4fd1b4da37274e930e657ddcb510c38..8956d5a1845185c1d19b6f9f57f675074c699769 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dennis <dtsang29@hotmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-15 00:05+0100\n"
-"PO-Revision-Date: 2013-03-14 09:10+0000\n"
-"Last-Translator: dtsang29 <dtsang29@hotmail.com>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +17,87 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "檔案加密已開啟"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "以下文件類別將不會被加密"
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr ""
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "空"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index f5a0dad84288b6d77ed9fb2affd504c4798ca680..a492dedfe1ab36986bb35b50162d57f64d75194c 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-03-14 00:05+0100\n"
-"PO-Revision-Date: 2013-03-13 02:10+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -37,19 +37,26 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:423
+#: 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:426
+#: 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 ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 792810587f790ddc80fca56334c2c5dd917fb01e..cc4d9910a5182cfaccb4ba894b1c9e3652b539f0 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/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-03-14 00:05+0100\n"
-"PO-Revision-Date: 2012-08-12 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,14 +35,14 @@ msgstr ""
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:19 templates/public.php:37
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "下載"
 
-#: templates/public.php:34
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: 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 451321361d1ba7b3d570f362c3dc20ca1eeb1e5f..ac820407ffcdd6324f40e0eb18c0cb91d9de8623 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:7 js/trash.js:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr ""
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
 msgstr "錯誤"
 
@@ -39,31 +39,31 @@ msgstr "錯誤"
 msgid "delete file permanently"
 msgstr ""
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "名稱"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{}文件夾"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index 9d6dd7c46ee062f52909563aa466236f28a181ac..dd784928453f287ac939cd41dc7326283228cbeb 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dennis <dtsang29@hotmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-15 00:05+0100\n"
-"PO-Revision-Date: 2013-03-14 09:10+0000\n"
-"Last-Translator: dtsang29 <dtsang29@hotmail.com>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 0cb6877d5a3b81e2d13414e88ed80477bddceb61..dc43155025b58de5feaaf90b4972ceb9639da508 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+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: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,47 +17,47 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "幫助"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "用戶"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "軟件"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr ""
 
@@ -93,10 +93,6 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
-
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
@@ -117,72 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
+#: setup.php:155
+msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:583 setup.php:615
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:853
+#: setup.php:867
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
@@ -239,19 +239,6 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:81
-msgid "up to date"
-msgstr ""
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr ""
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 8b8487313514ba65dee02bb6143df4e58038c31f..852c2569c1b3d3f94dce11cb6a1c93d13726b0ab 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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr ""
 
@@ -116,52 +120,52 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr ""
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr ""
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr ""
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr ""
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr ""
 
@@ -312,19 +316,19 @@ msgstr ""
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -395,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "密碼"
 
@@ -419,82 +423,74 @@ msgstr "新密碼"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr ""
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr ""
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr ""
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
 msgstr "電郵"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index dfcf588c5748e6ef38fae06fcc4f5c5e9682b402..f2ee3cc4e14592267f0208798e44026a3a96fa85 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-03-15 00:05+0100\n"
-"PO-Revision-Date: 2013-03-14 02:50+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密碼"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "幫助"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 5a2c43c09ce8b3fa473f00fcfaa506d3dec9dd0c..944ff2142aa58bae225ccdf5d3e2f030c39534d3 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-01-15 00:03+0100\n"
-"PO-Revision-Date: 2013-01-14 23:04+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "URL: http://"
 msgstr ""
 
-#: templates/settings.php:6
+#: 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 "
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 8216d6f3dbeca0f69f8097ffa5c9c6139ae7e0cc..b6533e5334650d7c0afab4a957bcd76479add9eb 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-# Ming Yi Wu <mingi.wu@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-# Pellaeon Lin <nfsmwlin@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-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:20+0000\n"
-"Last-Translator: Hydriz <admin@alphacorp.tk>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -166,77 +161,81 @@ msgstr "十二月"
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:707
+#: js/js.js:718
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:708
+#: js/js.js:719
 msgid "1 minute ago"
 msgstr "1 分鐘前"
 
-#: js/js.js:709
+#: js/js.js:720
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分鐘前"
 
-#: js/js.js:710
+#: js/js.js:721
 msgid "1 hour ago"
-msgstr "1 個小時前"
+msgstr "1 小時之前"
 
-#: js/js.js:711
+#: js/js.js:722
 msgid "{hours} hours ago"
 msgstr "{hours} 小時前"
 
-#: js/js.js:712
+#: js/js.js:723
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:713
+#: js/js.js:724
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:714
+#: js/js.js:725
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:715
+#: js/js.js:726
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:716
+#: js/js.js:727
 msgid "{months} months ago"
 msgstr "{months} 個月前"
 
-#: js/js.js:717
+#: js/js.js:728
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:718
+#: js/js.js:729
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:719
+#: js/js.js:730
 msgid "years ago"
 msgstr "幾年前"
 
-#: js/oc-dialogs.js:126
+#: js/oc-dialogs.js:117
 msgid "Choose"
 msgstr "選擇"
 
-#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:162
-msgid "No"
-msgstr "No"
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr "載入檔案選擇器樣板發生錯誤"
 
-#: js/oc-dialogs.js:163
+#: js/oc-dialogs.js:164
 msgid "Yes"
-msgstr "Yes"
+msgstr "是"
 
-#: js/oc-dialogs.js:180
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr "否"
+
+#: js/oc-dialogs.js:185
 msgid "Ok"
-msgstr "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
@@ -299,7 +298,7 @@ msgstr "使用連結分享"
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:35
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密碼"
 
@@ -321,7 +320,7 @@ msgstr "到期日"
 
 #: js/share.js:211
 msgid "Share via email:"
-msgstr "透過 email 分享："
+msgstr "透過電子郵件分享："
 
 #: js/share.js:213
 msgid "No people found"
@@ -377,7 +376,7 @@ msgstr "錯誤的到期日設定"
 
 #: js/share.js:604
 msgid "Sending ..."
-msgstr "正在寄出..."
+msgstr "正在傳送..."
 
 #: js/share.js:615
 msgid "Email sent"
@@ -400,32 +399,35 @@ msgstr "ownCloud 密碼重設"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "請循以下聯結重設你的密碼： {link}"
+msgstr "請至以下連結重設您的密碼： {link}"
 
-#: lostpassword/templates/lostpassword.php:3
-msgid "You will receive a link to reset your password via Email."
-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 "重設密碼的連結已經寄至您的電子郵件信箱，如果您過了一段時間還是沒有收到它，請檢查看看它是不是被放到垃圾郵件了，如果還是沒有的話，請聯絡您的 ownCloud 系統管理員。"
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Reset email send."
-msgstr "重設郵件已送出。"
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？"
 
-#: lostpassword/templates/lostpassword.php:8
-msgid "Request failed!"
-msgstr "請求失敗！"
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr "重設密碼的連結將會寄到你的電子郵件信箱。"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:48
-#: templates/login.php:28
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
 msgid "Username"
 msgstr "使用者名稱"
 
-#: lostpassword/templates/lostpassword.php:14
+#: lostpassword/templates/lostpassword.php:21
 msgid "Request reset"
 msgstr "請求重設"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "你的密碼已重設"
+msgstr "您的密碼已重設"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -453,11 +455,11 @@ msgstr "應用程式"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "管理者"
+msgstr "管理"
 
 #: strings.php:9
 msgid "Help"
-msgstr "幫助"
+msgstr "說明"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -465,7 +467,7 @@ msgstr "存取被拒"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "未發現雲"
+msgstr "未發現雲端"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -482,11 +484,11 @@ msgstr "安全性警告"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "您的PHP版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)"
+msgstr "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "請更新您的PHP安裝以更安全地使用ownCloud。"
+msgstr "請更新您的 PHP 安裝以更安全地使用 ownCloud 。"
 
 #: templates/installation.php:32
 msgid ""
@@ -525,75 +527,80 @@ msgstr "進階"
 msgid "Data folder"
 msgstr "資料夾"
 
-#: templates/installation.php:73
+#: templates/installation.php:74
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:78 templates/installation.php:90
-#: templates/installation.php:101 templates/installation.php:112
-#: templates/installation.php:124
+#: 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:136
+#: templates/installation.php:137
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:141
+#: templates/installation.php:144
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:146
+#: templates/installation.php:149
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:156
+#: templates/installation.php:159
 msgid "Database tablespace"
 msgstr "資料庫 tablespace"
 
-#: templates/installation.php:163
+#: templates/installation.php:166
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:169
+#: templates/installation.php:172
 msgid "Finish setup"
 msgstr "完成設定"
 
 #: templates/layout.guest.php:40
 msgid "web services under your control"
-msgstr "網路服務在您控制之下"
+msgstr "由您控制的網路服務"
+
+#: templates/layout.user.php:37
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 
-#: templates/layout.user.php:58
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "登出"
 
-#: templates/login.php:10
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr "自動登入被拒！"
 
-#: templates/login.php:11
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr "如果您最近並未更改密碼，您的帳號可能已經遭到入侵！"
 
-#: templates/login.php:13
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "請更改您的密碼以再次取得您的帳戶的控制權。"
+msgstr "請更改您的密碼以再次取得您帳戶的控制權。"
 
-#: templates/login.php:19
+#: templates/login.php:34
 msgid "Lost your password?"
 msgstr "忘記密碼？"
 
-#: templates/login.php:41
+#: templates/login.php:39
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:43
+#: templates/login.php:41
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:49
+#: templates/login.php:47
 msgid "Alternative Logins"
 msgstr "替代登入方法"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index ec64b61e9f01f8e0f1a3059e504945ae47e3e93e..7a374f45b2462575fe218559426445035522546e 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -3,21 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-# Eddy Chang <taiwanmambo@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-#  <orinx@orinx.com>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-# ywang  <ywang1007@gmail.com>, 2012.
+# 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-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 03:10+0000\n"
-"Last-Translator: orinx <orinx@orinx.com>\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"
 "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"
@@ -35,10 +28,6 @@ msgstr "無法移動 %s - 同名的檔案已經存在"
 msgid "Could not move %s"
 msgstr "無法移動 %s"
 
-#: ajax/rename.php:22 ajax/rename.php:25
-msgid "Unable to rename file"
-msgstr "無法重新命名檔案"
-
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
 msgstr "沒有檔案被上傳。未知的錯誤。"
@@ -64,11 +53,11 @@ msgstr "只有檔案的一部分被上傳"
 
 #: ajax/upload.php:31
 msgid "No file was uploaded"
-msgstr "無已上傳檔案"
+msgstr "沒有檔案被上傳"
 
 #: ajax/upload.php:32
 msgid "Missing a temporary folder"
-msgstr "遺失暫存資料夾"
+msgstr "找不到暫存資料夾"
 
 #: ajax/upload.php:33
 msgid "Failed to write to disk"
@@ -86,55 +75,59 @@ msgstr "無效的資料夾。"
 msgid "Files"
 msgstr "檔案"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "分享"
+
+#: js/fileactions.js:126
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:127 templates/index.php:94 templates/index.php:95
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
 msgstr "刪除"
 
-#: js/fileactions.js:193
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:414
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:252
+#: js/filelist.js:259
 msgid "suggest name"
 msgstr "建議檔名"
 
-#: js/filelist.js:252 js/filelist.js:254
+#: js/filelist.js:259 js/filelist.js:261
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:299
+#: js/filelist.js:306
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:324
+#: js/filelist.js:331
 msgid "perform delete operation"
 msgstr "進行刪除動作"
 
-#: js/filelist.js:406
+#: js/filelist.js:413
 msgid "1 file uploading"
 msgstr "1 個檔案正在上傳"
 
-#: js/filelist.js:409 js/filelist.js:463
+#: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
 msgstr "檔案正在上傳中"
 
@@ -160,69 +153,77 @@ msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 
-#: js/files.js:226
+#: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/files.js:259
+#: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
 
-#: js/files.js:272
+#: js/files.js:277
 msgid "Not enough space available"
 msgstr "沒有足夠的可用空間"
 
-#: js/files.js:312
+#: js/files.js:317
 msgid "Upload cancelled."
-msgstr "上傳取消"
+msgstr "上傳已取消"
 
-#: js/files.js:408
+#: js/files.js:413
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中。離開此頁面將會取消上傳。"
 
-#: js/files.js:481
+#: js/files.js:486
 msgid "URL cannot be empty."
-msgstr "URL 不能為空白."
+msgstr "URL 不能為空白。"
 
-#: js/files.js:486
+#: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr "無效的資料夾名稱，'Shared' 的使用被 Owncloud 保留"
+msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/files.js:515 js/files.js:531 js/files.js:821 js/files.js:859
+#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:872 templates/index.php:70
+#: js/files.js:877 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:873 templates/index.php:81
+#: js/files.js:878 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:874 templates/index.php:83
+#: js/files.js:879 templates/index.php:82
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:893
+#: js/files.js:898
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:895
+#: js/files.js:900
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:903
+#: js/files.js:908
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:905
+#: js/files.js:910
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr "無法重新命名檔案"
+
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
 msgstr "上傳"
@@ -283,40 +284,40 @@ msgstr "已刪除的檔案"
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:55
+#: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr "您在這裏沒有編輯權。"
+msgstr "您在這裡沒有編輯權。"
 
-#: templates/index.php:62
+#: templates/index.php:61
 msgid "Nothing in here. Upload something!"
-msgstr "沒有任何東西。請上傳內容！"
+msgstr "這裡什麼也沒有，上傳一些東西吧！"
 
-#: templates/index.php:76
+#: templates/index.php:75
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:88 templates/index.php:89
+#: templates/index.php:87 templates/index.php:88
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:108
+#: templates/index.php:107
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:110
+#: templates/index.php:109
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。　"
+msgstr "您試圖上傳的檔案已超過伺服器的最大檔案大小限制。"
 
-#: templates/index.php:115
+#: templates/index.php:114
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:118
+#: templates/index.php:117
 msgid "Current scanning"
 msgstr "目前掃描"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr "正在更新檔案系統快取..."
+msgstr "正在升級檔案系統快取..."
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 09a9812a652533c102cb3bdf81a321a85dfce370..ed4c130a772d395140a1d8e860a69fa558989d20 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-# ywang  <ywang1007@gmail.com>, 2012.
+# 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-03-20 00:02+0100\n"
-"PO-Revision-Date: 2013-03-19 03:40+0000\n"
-"Last-Translator: Hydriz <admin@alphacorp.tk>\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"
 "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,22 +18,87 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings-personal.php:4 templates/settings.php:5
+#: 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 "無法變更密碼，或許是輸入的舊密碼不正確。"
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "儲存中..."
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-personal.php:7
-msgid "File encryption is enabled."
-msgstr "檔案加密已被啟用"
+#: templates/settings-admin.php:9
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:13
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:20 templates/settings-personal.php:18
+msgid "Enabled"
+msgstr "已啓用"
+
+#: templates/settings-admin.php:28 templates/settings-personal.php:26
+msgid "Disabled"
+msgstr "已停用"
+
+#: templates/settings-admin.php:32
+msgid "Change encryption passwords recovery key:"
+msgstr "變更加密密碼還原金鑰："
+
+#: templates/settings-admin.php:39
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:46
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+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 "The following file types will not be encrypted:"
-msgstr "以下的文件類型不會被加密："
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files if your password is lost"
+msgstr "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案"
 
-#: templates/settings.php:7
-msgid "Exclude the following file types from encryption:"
-msgstr "從加密中排除的檔案類型："
+#: templates/settings-personal.php:27
+msgid "File recovery settings updated"
+msgstr "檔案還原設定已更新"
 
-#: templates/settings.php:12
-msgid "None"
-msgstr "ç„¡"
+#: templates/settings-personal.php:28
+msgid "Could not update file recovery"
+msgstr "無法更新檔案還原設定"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 500db5751dbbf7182eeebe2073154e985d629adf..573c495c8bf2fb0bb1f9f67ed795dde5d2be6f0a 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-#   <dw4dev@gmail.com>, 2012.
+# 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-03-30 00:04+0100\n"
-"PO-Revision-Date: 2013-03-29 13:00+0000\n"
-"Last-Translator: Hydriz <admin@alphacorp.tk>\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"
 "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"
@@ -21,40 +20,47 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
 msgid "Access granted"
-msgstr "訪問權已被准許"
+msgstr "允許存取"
 
 #: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "設定 Dropbox 儲存時發生錯誤"
 
 #: js/dropbox.js:65 js/google.js:66
 msgid "Grant access"
-msgstr "准許訪問權"
+msgstr "允許存取"
 
 #: js/dropbox.js:101
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "請提供有效的 Dropbox app key 和 app secret 。"
 
 #: js/google.js:36 js/google.js:93
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "設定 Google Drive 儲存時發生錯誤"
 
-#: lib/config.php:423
+#: 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 ""
+msgstr "<b>警告</b>：未安裝 \"smbclient\" ，因此無法掛載 CIFS/SMB 分享，請洽您的系統管理員將其安裝。"
 
-#: lib/config.php:426
+#: 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 ""
+msgstr "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 FTP 分享，請洽您的系統管理員將其安裝並啓用。"
+
+#: 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 "<b>警告</b>：PHP 並未啓用 Curl 的支援，因此無法掛載 ownCloud/WebDAV 或 Google Drive 分享，請洽您的系統管理員將其安裝並啓用。"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr "外部儲存裝置"
+msgstr "外部儲存"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
@@ -62,7 +68,7 @@ msgstr "資料夾名稱"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr "外部儲存裝置"
+msgstr "外部儲存"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -74,11 +80,11 @@ msgstr "選項"
 
 #: templates/settings.php:13
 msgid "Applicable"
-msgstr ""
+msgstr "可用的"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr "添加儲存區"
+msgstr "增加儲存區"
 
 #: templates/settings.php:90
 msgid "None set"
@@ -103,15 +109,15 @@ msgstr "刪除"
 
 #: templates/settings.php:129
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "啓用使用者外部儲存"
 
 #: templates/settings.php:130
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "允許使用者自行掛載他們的外部儲存"
 
 #: templates/settings.php:141
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL 根憑證"
 
 #: templates/settings.php:159
 msgid "Import Root Certificate"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index c60cf46d161e377aea9bcadde4f3c316c28bb060..9c7942279e425ab5e8c8598f6be20a438d0205a6 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -3,15 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dw4dev@gmail.com>, 2012.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-#   <wu0809@msn.com>, 2012.
+# 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-01-25 00:05+0100\n"
-"PO-Revision-Date: 2013-01-24 13:15+0000\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -28,24 +26,24 @@ msgstr "密碼"
 msgid "Submit"
 msgstr "送出"
 
-#: templates/public.php:17
+#: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr "%s 分享了資料夾 %s 給您"
+msgstr "%s 和您分享了資料夾 %s "
 
-#: templates/public.php:19
+#: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr "%s 分享了檔案 %s 給您"
+msgstr "%s 和您分享了檔案 %s"
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:19 templates/public.php:43
 msgid "Download"
 msgstr "下載"
 
-#: templates/public.php:37
+#: templates/public.php:40
 msgid "No preview available for"
 msgstr "無法預覽"
 
-#: templates/public.php:43
+#: templates/public.php:50
 msgid "web services under your control"
-msgstr "在您掌控之下的網路服務"
+msgstr "由您控制的網路服務"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 2e28f7947c88e40a5c7397053285a04d6ddb9e9b..32a463d2ebab3d455f6e16e534f7368c4e72eb05 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/files_trashbin.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-09 02:10+0200\n"
-"PO-Revision-Date: 2013-04-08 02:21+0000\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -21,56 +20,56 @@ 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:96
+#: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
 msgstr "進行復原動作"
 
-#: js/trash.js:19 js/trash.js:46 js/trash.js:114 js/trash.js:139
+#: 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 "永久刪除文件"
+msgstr "永久刪除檔案"
 
-#: js/trash.js:121
+#: js/trash.js:123
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/trash.js:174 templates/index.php:17
+#: js/trash.js:176 templates/index.php:17
 msgid "Name"
 msgstr "名稱"
 
-#: js/trash.js:175 templates/index.php:27
+#: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
 msgstr "已刪除"
 
-#: js/trash.js:184
+#: js/trash.js:186
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/trash.js:186
+#: js/trash.js:188
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/trash.js:194
+#: js/trash.js:196
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/trash.js:196
+#: js/trash.js:198
 msgid "{count} files"
 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"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 21a6ddbdf6e62d2a7c76e68f48656f3efb03e54c..dbe4ec462d0c82a88ccf3cd897b517f37525645a 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.po
@@ -3,15 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-#   <dw4dev@gmail.com>, 2012.
+# 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-03-20 00:02+0100\n"
-"PO-Revision-Date: 2013-03-19 03:30+0000\n"
-"Last-Translator: Hydriz <admin@alphacorp.tk>\n"
+"POT-Creation-Date: 2013-05-25 02:01+0200\n"
+"PO-Revision-Date: 2013-05-24 13:28+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +47,7 @@ msgstr "沒有舊的版本"
 
 #: history.php:74
 msgid "No path specified"
-msgstr "沒有指定路線"
+msgstr "沒有指定路徑"
 
 #: js/versions.js:6
 msgid "Versions"
@@ -56,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/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 5059ed80d0171643469000c5a9e9c66974397a7e..b62006f29fcadf1e4ec13cad211f48a20a3a4f46 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Hydriz Scholz <admin@alphacorp.tk>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-#   <sofia168@livemail.tw>, 2012.
-#   <ywang1007+transifex@gmail.com>, 2012.
-# ywang  <ywang1007@gmail.com>, 2012.
+# 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-04-01 00:02+0200\n"
-"PO-Revision-Date: 2013-03-31 22:01+0000\n"
-"Last-Translator: Hydriz <admin@alphacorp.tk>\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,47 +18,47 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:349
+#: app.php:357
 msgid "Help"
 msgstr "說明"
 
-#: app.php:362
+#: app.php:370
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:373
+#: app.php:381
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:385
+#: app.php:393
 msgid "Users"
 msgstr "使用者"
 
-#: app.php:398
+#: app.php:406
 msgid "Apps"
 msgstr "應用程式"
 
-#: app.php:406
+#: app.php:414
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:209
+#: files.php:210
 msgid "ZIP download is turned off."
-msgstr "ZIP 下載已關閉"
+msgstr "ZIP 下載已關閉。"
 
-#: files.php:210
+#: files.php:211
 msgid "Files need to be downloaded one by one."
-msgstr "檔案需要逐一下載"
+msgstr "檔案需要逐一下載。"
 
-#: files.php:211 files.php:244
+#: files.php:212 files.php:245
 msgid "Back to Files"
 msgstr "回到檔案列表"
 
-#: files.php:241
+#: files.php:242
 msgid "Selected files too large to generate zip file."
-msgstr "選擇的檔案太大以致於無法產生壓縮檔"
+msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "無法判斷"
 
@@ -92,102 +88,102 @@ msgstr "圖片"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr "設置一個管理員用戶名。"
+msgstr "設定管理員帳號。"
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr "設置一個管理員密碼。"
-
-#: setup.php:40
-msgid "Specify a data folder."
-msgstr ""
+msgstr "設定管理員密碼。"
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s 輸入資料庫使用者名稱。"
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s 輸入資料庫名稱。"
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s 資料庫名稱不能包含小數點"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s 設定資料庫主機。"
 
-#: setup.php:132 setup.php:324 setup.php:369
+#: setup.php:132 setup.php:329 setup.php:374
 msgid "PostgreSQL username and/or password not valid"
-msgstr "PostgreSQL用戶名和/或密碼無效"
+msgstr "PostgreSQL 用戶名和/或密碼無效"
 
-#: setup.php:133 setup.php:156 setup.php:233
+#: setup.php:133 setup.php:238
 msgid "You need to enter either an existing account or the administrator."
-msgstr "您必須輸入一個現有的賬戶或管理員"
+msgstr "您必須輸入一個現有的帳號或管理員帳號。"
 
-#: setup.php:155 setup.php:457 setup.php:524
-msgid "Oracle username and/or password not valid"
-msgstr "Oracle用戶名和/或密碼無效"
+#: setup.php:155
+msgid "Oracle connection could not be established"
+msgstr "無法建立 Oracle 資料庫連線"
 
-#: setup.php:232
+#: setup.php:237
 msgid "MySQL username and/or password not valid"
-msgstr "MySQL用戶名和/或密碼無效"
+msgstr "MySQL 用戶名和/或密碼無效"
 
-#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
-#: setup.php:436 setup.php:465 setup.php:531 setup.php:557 setup.php:564
-#: setup.php:575 setup.php:582 setup.php:591 setup.php:599 setup.php:608
-#: setup.php:614
+#: 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
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "資料庫錯誤：\"%s\""
 
-#: setup.php:287 setup.php:391 setup.php:400 setup.php:418 setup.php:428
-#: setup.php:437 setup.php:466 setup.php:532 setup.php:558 setup.php:565
-#: setup.php:576 setup.php:592 setup.php:600 setup.php:609
+#: 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
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "有問題的指令是：\"%s\""
 
-#: setup.php:303
+#: setup.php:308
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL 使用者 '%s'@'localhost' 已經存在。"
 
-#: setup.php:304
+#: setup.php:309
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "在 MySQL 移除這個使用者"
 
-#: setup.php:309
+#: setup.php:314
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQL 使用者 '%s'@'%%' 已經存在"
 
-#: setup.php:310
+#: setup.php:315
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "在 MySQL 移除這個使用者。"
+
+#: setup.php:466 setup.php:533
+msgid "Oracle username and/or password not valid"
+msgstr "Oracle 用戶名和/或密碼無效"
 
-#: setup.php:583 setup.php:615
+#: setup.php:592 setup.php:624
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
 
-#: setup.php:635
+#: setup.php:644
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL 使用者和/或密碼無效：%s"
 
-#: setup.php:853
+#: setup.php:867
 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:854
+#: setup.php:868
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
@@ -244,19 +240,6 @@ msgstr "去年"
 msgid "years ago"
 msgstr "幾年前"
 
-#: updater.php:78
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s 已經可用。取得 <a href=\"%s\">更多資訊</a>"
-
-#: updater.php:81
-msgid "up to date"
-msgstr "最新的"
-
-#: updater.php:84
-msgid "updates check is disabled"
-msgstr "檢查更新已停用"
-
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index e9b7565831cced5f3b621ef96d38fb15600a77e6..61325b65b5c9c6dd3fd267d7f674cba694acebbd 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -3,24 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Donahue Chuang <soshinwu@gmail.com>, 2012.
-#   <dw4dev@gmail.com>, 2012.
-#   <nfsmwlin@gmail.com>, 2013.
-#  <orinx@orinx.com>, 2013.
-# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
-#   <sy6614@yahoo.com.hk>, 2012.
-#  <tseronnie@ymail.com>, 2013.
-#   <weiyu871@ms14.url.com.tw>, 2012.
-#   <wu0809@msn.com>, 2012.
-# ywang  <ywang1007@gmail.com>, 2012.
+# 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-04-10 02:08+0200\n"
-"PO-Revision-Date: 2013-04-09 03:20+0000\n"
-"Last-Translator: orinx <orinx@orinx.com>\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"
 "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"
@@ -32,12 +22,16 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "無法從 App Store 讀取清單"
 
-#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20
 msgid "Authentication error"
 msgstr "認證錯誤"
 
-#: ajax/changedisplayname.php:32
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr "已更改顯示名稱"
+
+#: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
 msgstr "無法更改顯示名稱"
 
@@ -127,52 +121,52 @@ msgstr "更新應用程式錯誤"
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:99
+#: js/personal.js:118
 msgid "Saving..."
 msgstr "儲存中..."
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "deleted"
 msgstr "已刪除"
 
-#: js/users.js:31
+#: js/users.js:47
 msgid "undo"
 msgstr "復原"
 
-#: js/users.js:63
+#: js/users.js:79
 msgid "Unable to remove user"
 msgstr "無法刪除用戶"
 
-#: js/users.js:76 templates/users.php:26 templates/users.php:80
-#: templates/users.php:105
+#: js/users.js:92 templates/users.php:26 templates/users.php:83
+#: templates/users.php:108
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:79 templates/users.php:82 templates/users.php:119
+#: js/users.js:95 templates/users.php:85 templates/users.php:120
 msgid "Group Admin"
 msgstr "群組 管理員"
 
-#: js/users.js:99 templates/users.php:161
+#: js/users.js:115 templates/users.php:160
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:243
+#: js/users.js:269
 msgid "add group"
 msgstr "新增群組"
 
-#: js/users.js:407
+#: js/users.js:428
 msgid "A valid username must be provided"
 msgstr "一定要提供一個有效的用戶名"
 
-#: js/users.js:408 js/users.js:414 js/users.js:429
+#: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
 msgstr "創建用戶時出現錯誤"
 
-#: js/users.js:413
+#: js/users.js:434
 msgid "A valid password must be provided"
 msgstr "一定要提供一個有效的密碼"
 
-#: personal.php:29 personal.php:30
+#: personal.php:35 personal.php:36
 msgid "__language_name__"
 msgstr "__語言_名稱__"
 
@@ -191,7 +185,7 @@ msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "設定警告"
 
 #: templates/admin.php:32
 msgid ""
@@ -216,7 +210,7 @@ msgstr "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "語系無法運作"
 
 #: templates/admin.php:63
 #, php-format
@@ -224,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"
@@ -238,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 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。"
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -252,17 +246,17 @@ msgstr "當頁面載入時，執行"
 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 呼叫 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 服務，每分鐘執行一次 owncloud 資料夾中的 cron.php 。"
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "分享"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
@@ -323,19 +317,19 @@ msgstr "紀錄"
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:223
+#: templates/admin.php:227
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:224
+#: templates/admin.php:228
 msgid "Less"
 msgstr "å°‘"
 
-#: templates/admin.php:231 templates/personal.php:102
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:234 templates/personal.php:105
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -400,13 +394,13 @@ msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>
 
 #: templates/personal.php:15
 msgid "Get the apps to sync your files"
-msgstr "獲取那些同步您的文件的應用程序"
+msgstr "下載應用程式來同步您的檔案"
 
 #: templates/personal.php:26
 msgid "Show First Run Wizard again"
 msgstr "再次顯示首次使用精靈"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:79
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
 msgid "Password"
 msgstr "密碼"
 
@@ -416,7 +410,7 @@ msgstr "你的密碼已更改"
 
 #: templates/personal.php:39
 msgid "Unable to change your password"
-msgstr "無法變更你的密碼"
+msgstr "無法變更您的密碼"
 
 #: templates/personal.php:40
 msgid "Current password"
@@ -430,82 +424,74 @@ msgstr "新密碼"
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/personal.php:56 templates/users.php:78
+#: templates/personal.php:56 templates/users.php:81
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: templates/personal.php:57
-msgid "Your display name was changed"
-msgstr "已更改顯示名稱"
-
-#: templates/personal.php:58
-msgid "Unable to change your display name"
-msgstr "無法更改您的顯示名稱"
-
-#: templates/personal.php:61
-msgid "Change display name"
-msgstr "更改顯示名稱"
-
-#: templates/personal.php:70
+#: templates/personal.php:71
 msgid "Email"
-msgstr "電子郵件"
+msgstr "ä¿¡ç®±"
 
-#: templates/personal.php:72
+#: templates/personal.php:73
 msgid "Your email address"
-msgstr "你的電子郵件信箱"
+msgstr "您的電子郵件信箱"
 
-#: templates/personal.php:73
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "請填入電子郵件信箱以便回復密碼"
 
-#: templates/personal.php:79 templates/personal.php:80
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:86
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:91
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:93
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "在您的檔案管理員中使用這個地址來連線到 ownCloud"
 
-#: templates/users.php:21 templates/users.php:77
+#: templates/users.php:21 templates/users.php:80
 msgid "Login Name"
 msgstr "登入名稱"
 
-#: templates/users.php:32
+#: templates/users.php:30
 msgid "Create"
-msgstr "創造"
+msgstr "建立"
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr "管理者復原密碼"
 
-#: templates/users.php:35
+#: templates/users.php:38
 msgid "Default Storage"
 msgstr "預設儲存區"
 
-#: templates/users.php:41 templates/users.php:139
+#: templates/users.php:44 templates/users.php:138
 msgid "Unlimited"
 msgstr "無限制"
 
-#: templates/users.php:59 templates/users.php:154
+#: templates/users.php:62 templates/users.php:153
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:84
+#: templates/users.php:87
 msgid "Storage"
 msgstr "儲存區"
 
-#: templates/users.php:95
+#: templates/users.php:98
 msgid "change display name"
 msgstr "修改顯示名稱"
 
-#: templates/users.php:99
+#: templates/users.php:102
 msgid "set new password"
 msgstr "設定新密碼"
 
-#: templates/users.php:134
+#: templates/users.php:133
 msgid "Default"
 msgstr "預設"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index e5f5c2a0e985e867587fe3680696f42f0c63b595..0a1118b448bfee21c12adb43ad600dc50bc2194e 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <dw4dev@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-26 11:32+0000\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +17,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
 msgstr ""
@@ -54,281 +57,363 @@ msgstr ""
 msgid "Cannot add server configuration"
 msgstr ""
 
-#: js/settings.js:121
+#: 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:126
+#: js/settings.js:146
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:136
+#: js/settings.js:156
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:137
+#: js/settings.js:157
 msgid "Confirm Deletion"
 msgstr ""
 
-#: templates/settings.php:8
+#: 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:11
+#: 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:15
+#: templates/settings.php:16
 msgid "Server configuration"
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:32
 msgid "Add Server Configuration"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:37
 msgid "Host"
 msgstr "主機"
 
-#: templates/settings.php:38
+#: templates/settings.php:39
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:40
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:41
 msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:41
+#: templates/settings.php:42
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:45
+#: 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:46
+#: templates/settings.php:47
 msgid "Password"
 msgstr "密碼"
 
-#: templates/settings.php:49
+#: templates/settings.php:50
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:50
+#: templates/settings.php:51
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:53
+#: 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:54
+#: templates/settings.php:55
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:64
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:65
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:68
+#: templates/settings.php:69
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:70
+#: templates/settings.php:71
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:71
+#: templates/settings.php:72
 msgid "Port"
 msgstr "連接阜"
 
-#: templates/settings.php:72
+#: templates/settings.php:73
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:72
+#: 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:73
+#: templates/settings.php:74
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:74
+#: templates/settings.php:75
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:75
+#: templates/settings.php:76
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:77
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:77
+#: templates/settings.php:78
 msgid "Turn off SSL certificate validation."
 msgstr "關閉 SSL 憑證驗證"
 
-#: templates/settings.php:77
+#: 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:77
+#: templates/settings.php:78
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:78
+#: templates/settings.php:79
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:80
+#: templates/settings.php:81
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:83
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:83
+#: templates/settings.php:84
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:88
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:89
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:91
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:93
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:93
+#: templates/settings.php:94
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:95
+#: templates/settings.php:96
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:99
+#: 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:99
+#: templates/settings.php:111
 msgid "Help"
 msgstr "說明"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 1cf834607153a01aa33fcd026405057a0801c301..bfb582efc97056ed32b3a564c128770a7d02211f 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#  <admin@alphacorp.tk>, 2013.
-# Hydriz Scholz <admin@alphacorp.tk>, 2013.
-#   <sofia168@livemail.tw>, 2012.
+# Hydriz <admin@alphacorp.tk>, 2013
+# Hydriz <admin@alphacorp.tk>, 2013
+# pellaeon <nfsmwlin@gmail.com>, 2013
+# sofiasu <sofia168@livemail.tw>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-27 00:08+0100\n"
-"PO-Revision-Date: 2013-03-23 12:10+0000\n"
-"Last-Translator: Hydriz <admin@alphacorp.tk>\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"
 "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"
@@ -33,4 +34,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 "ownCloud會將把用戶的證件發送到這個網址。這個插件會檢查回應，並把HTTP狀態代碼401和403視為無效證件和所有其他回應視為有效證件。"
+msgstr "ownCloud 會將把用戶的登入資訊發送到這個網址以嘗試登入，並檢查回應， HTTP 狀態碼401和403視為登入失敗，所有其他回應視為登入成功。"
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 8f057cfb6e8820c28f75cbf2d5478648db2f5902..693ceffa01c0d22b9ef49ce5e3a6ddb5557d908d 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         $php_errormsg = '';
 		$this->connection = new SQLite3($database_file);
 		if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3
-			$this->connection->busyTimeout(100);
+			$this->connection->busyTimeout(60000);
 		}
         $this->_lasterror = $this->connection->lastErrorMsg();
         if (!$this->connection) {
@@ -892,10 +892,10 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         $connection = $this->getConnection();
         if (PEAR::isError($connection)) {
             return $connection;
-		}
+        }
         $statement =$this->connection->prepare($query);
         if (!$statement) {
-            return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
                         'unable to prepare statement: '.$query);
         }
 
diff --git a/lib/api.php b/lib/api.php
index 8d6bbb7cc09631f038d9beca6bcae25e123c7ad0..fc76836995be415ae104b422b17606ced32c8133 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -89,7 +89,7 @@ class OC_API {
 		$responses = array();
 		foreach(self::$actions[$name] as $action) {
 			// Check authentication and availability
-			if(!self::isAuthorised(self::$actions[$name])) {
+			if(!self::isAuthorised($action)) {
 				$responses[] = array(
 					'app' => $action['app'],
 					'response' => new OC_OCS_Result(null, OC_API::RESPOND_UNAUTHORISED, 'Unauthorised'),
@@ -111,9 +111,11 @@ class OC_API {
 		}
 		$response = self::mergeResponses($responses);
 		$formats = array('json', 'xml');
+
 		$format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml';
-		self::respond($response);
 		OC_User::logout();
+
+		self::respond($response, $format);
 	}
 	
 	/**
@@ -147,6 +149,7 @@ class OC_API {
 				}
 			}
 		}
+
 		// Remove any error responses if there is one shipped response that succeeded
 		if(!empty($shipped['succeeded'])) {
 			$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
@@ -155,16 +158,19 @@ class OC_API {
 			// They may have failed for different reasons (different status codes)
 			// Which reponse code should we return?
 			// Maybe any that are not OC_API::RESPOND_SERVER_ERROR
-			$response = $shipped['failed'][0];
+			$response = reset($shipped['failed']);
 			return $response;
-		} else {
+		} elseif(!empty($thirdparty['failed'])) {
 			// Return the third party failure result
-			$response = $thirdparty['failed'][0];
+			$response = reset($thirdparty['failed']);
 			return $response;
+		} else {
+			$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
 		}
 		// Merge the successful responses
 		$meta = array();
 		$data = array();
+
 		foreach($responses as $app => $response) {
 			if(OC_App::isShipped($app)) {
 				$data = array_merge_recursive($response->getData(), $data);
diff --git a/lib/app.php b/lib/app.php
index 55b4543ec9f874b0085a9118eb7334748c1f06c0..c6f6e92e60e255d67ece010cf26e432788f70da2 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -172,9 +172,17 @@ class OC_App{
 			return array();
 		}
 		$apps=array('files');
-		$query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig`'
-			.' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'' );
+		$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
+			.' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
+		if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
+			$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
+			.' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'';
+		}
+		$query = OC_DB::prepare( $sql );
 		$result=$query->execute();
+		if( \OC_DB::isError($result)) {
+			throw new DatabaseException($result->getMessage(), $query);
+		}
 		while($row=$result->fetchRow()) {
 			if(array_search($row['appid'], $apps)===false) {
 				$apps[]=$row['appid'];
diff --git a/lib/autoloader.php b/lib/autoloader.php
new file mode 100644
index 0000000000000000000000000000000000000000..9615838a9a2a27d608621ad32cf8eddb6e0ac5e2
--- /dev/null
+++ b/lib/autoloader.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class Autoloader {
+	private $useGlobalClassPath = true;
+
+	private $prefixPaths = array();
+
+	private $classPaths = array();
+
+	/**
+	 * Add a custom prefix to the autoloader
+	 *
+	 * @param string $prefix
+	 * @param string $path
+	 */
+	public function registerPrefix($prefix, $path) {
+		$this->prefixPaths[$prefix] = $path;
+	}
+
+	/**
+	 * Add a custom classpath to the autoloader
+	 *
+	 * @param string $class
+	 * @param string $path
+	 */
+	public function registerClass($class, $path) {
+		$this->classPaths[$class] = $path;
+	}
+
+	/**
+	 * disable the usage of the global classpath \OC::$CLASSPATH
+	 */
+	public function disableGlobalClassPath() {
+		$this->useGlobalClassPath = false;
+	}
+
+	/**
+	 * enable the usage of the global classpath \OC::$CLASSPATH
+	 */
+	public function enableGlobalClassPath() {
+		$this->useGlobalClassPath = true;
+	}
+
+	/**
+	 * get the possible paths for a class
+	 *
+	 * @param string $class
+	 * @return array|bool an array of possible paths or false if the class is not part of ownCloud
+	 */
+	public function findClass($class) {
+		$class = trim($class, '\\');
+
+		$paths = array();
+		if (array_key_exists($class, $this->classPaths)) {
+			$paths[] = $this->classPaths[$class];
+		} else if ($this->useGlobalClassPath and array_key_exists($class, \OC::$CLASSPATH)) {
+			$paths[] = \OC::$CLASSPATH[$class];
+			/**
+			 * @TODO: Remove this when necessary
+			 * Remove "apps/" from inclusion path for smooth migration to mutli app dir
+			 */
+			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
+				\OC_Log::write('core', 'include path for class "' . $class . '" starts with "apps/"', \OC_Log::DEBUG);
+				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
+			}
+		} elseif (strpos($class, 'OC_') === 0) {
+			// first check for legacy classes if underscores are used
+			$paths[] = 'legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+		} elseif (strpos($class, 'OC\\') === 0) {
+			$paths[] = strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
+		} elseif (strpos($class, 'OCP\\') === 0) {
+			$paths[] = 'public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
+		} elseif (strpos($class, 'OCA\\') === 0) {
+			list(, $app, $rest) = explode('\\', $class, 3);
+			$app = strtolower($app);
+			foreach (\OC::$APPSROOTS as $appDir) {
+				if (stream_resolve_include_path($appDir['path'] . '/' . $app)) {
+					$paths[] = $appDir['path'] . '/' . $app . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+					// If not found in the root of the app directory, insert '/lib' after app id and try again.
+					$paths[] = $appDir['path'] . '/' . $app . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				}
+			}
+		} elseif (strpos($class, 'Test_') === 0) {
+			$paths[] = 'tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
+		} elseif (strpos($class, 'Test\\') === 0) {
+			$paths[] = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
+		} 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);
+					$paths[] = $dir . '/' . $path;
+				}
+			}
+		}
+		return $paths;
+	}
+
+	/**
+	 * Load the specified class
+	 *
+	 * @param string $class
+	 * @return bool
+	 */
+	public function load($class) {
+		$paths = $this->findClass($class);
+
+		if (is_array($paths)) {
+			foreach ($paths as $path) {
+				if ($fullPath = stream_resolve_include_path($path)) {
+					require_once $fullPath;
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/lib/backgroundjob/job.php b/lib/backgroundjob/job.php
new file mode 100644
index 0000000000000000000000000000000000000000..49fbffbd6849039476790058f8e7bd64b2cf3433
--- /dev/null
+++ b/lib/backgroundjob/job.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+abstract class Job {
+	protected $id;
+	protected $lastRun;
+	protected $argument;
+
+	/**
+	 * @param JobList $jobList
+	 */
+	public function execute($jobList) {
+		$jobList->setLastRun($this);
+		$this->run($this->argument);
+	}
+
+	abstract protected function run($argument);
+
+	public function setId($id) {
+		$this->id = $id;
+	}
+
+	public function setLastRun($lastRun) {
+		$this->lastRun = $lastRun;
+	}
+
+	public function setArgument($argument) {
+		$this->argument = $argument;
+	}
+
+	public function getId() {
+		return $this->id;
+	}
+
+	public function getLastRun() {
+		return $this->lastRun;
+	}
+
+	public function getArgument() {
+		return $this->argument;
+	}
+}
diff --git a/lib/backgroundjob/joblist.php b/lib/backgroundjob/joblist.php
new file mode 100644
index 0000000000000000000000000000000000000000..cc803dd9b5fb73d98e5f67cb8f45f0fe5fe967f1
--- /dev/null
+++ b/lib/backgroundjob/joblist.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+/**
+ * Class QueuedJob
+ *
+ * create a background job that is to be executed once
+ *
+ * @package OC\BackgroundJob
+ */
+class JobList {
+	/**
+	 * @param Job|string $job
+	 * @param mixed $argument
+	 */
+	public function add($job, $argument = null) {
+		if (!$this->has($job, $argument)) {
+			if ($job instanceof Job) {
+				$class = get_class($job);
+			} else {
+				$class = $job;
+			}
+			$argument = json_encode($argument);
+			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*jobs`(`class`, `argument`, `last_run`) VALUES(?, ?, 0)');
+			$query->execute(array($class, $argument));
+		}
+	}
+
+	/**
+	 * @param Job|string $job
+	 * @param mixed $argument
+	 */
+	public function remove($job, $argument = null) {
+		if ($job instanceof Job) {
+			$class = get_class($job);
+		} else {
+			$class = $job;
+		}
+		if (!is_null($argument)) {
+			$argument = json_encode($argument);
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*jobs` WHERE `class` = ? AND `argument` = ?');
+			$query->execute(array($class, $argument));
+		} else {
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*jobs` WHERE `class` = ?');
+			$query->execute(array($class));
+		}
+	}
+
+	/**
+	 * check if a job is in the list
+	 *
+	 * @param $job
+	 * @param mixed $argument
+	 * @return bool
+	 */
+	public function has($job, $argument) {
+		if ($job instanceof Job) {
+			$class = get_class($job);
+		} else {
+			$class = $job;
+		}
+		$argument = json_encode($argument);
+		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*jobs` WHERE `class` = ? AND `argument` = ?');
+		$result = $query->execute(array($class, $argument));
+		return (bool)$result->fetchRow();
+	}
+
+	/**
+	 * get all jobs in the list
+	 *
+	 * @return Job[]
+	 */
+	public function getAll() {
+		$query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs`');
+		$result = $query->execute();
+		$jobs = array();
+		while ($row = $result->fetchRow()) {
+			$jobs[] = $this->buildJob($row);
+		}
+		return $jobs;
+	}
+
+	/**
+	 * get the next job in the list
+	 *
+	 * @return Job
+	 */
+	public function getNext() {
+		$lastId = $this->getLastJob();
+		$query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` > ? ORDER BY `id` ASC', 1);
+		$result = $query->execute(array($lastId));
+		if ($row = $result->fetchRow()) {
+			return $this->buildJob($row);
+		} else {
+			//begin at the start of the queue
+			$query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` ORDER BY `id` ASC', 1);
+			$result = $query->execute();
+			if ($row = $result->fetchRow()) {
+				return $this->buildJob($row);
+			} else {
+				return null; //empty job list
+			}
+		}
+	}
+
+	/**
+	 * @param int $id
+	 * @return Job
+	 */
+	public function getById($id) {
+		$query = \OC_DB::prepare('SELECT `id`, `class`, `last_run`, `argument` FROM `*PREFIX*jobs` WHERE `id` = ?');
+		$result = $query->execute(array($id));
+		if ($row = $result->fetchRow()) {
+			return $this->buildJob($row);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * get the job object from a row in the db
+	 *
+	 * @param array $row
+	 * @return Job
+	 */
+	private function buildJob($row) {
+		$class = $row['class'];
+		/**
+		 * @var Job $job
+		 */
+		$job = new $class();
+		$job->setId($row['id']);
+		$job->setLastRun($row['last_run']);
+		$job->setArgument(json_decode($row['argument']));
+		return $job;
+	}
+
+	/**
+	 * set the job that was last ran
+	 *
+	 * @param Job $job
+	 */
+	public function setLastJob($job) {
+		\OC_Appconfig::setValue('backgroundjob', 'lastjob', $job->getId());
+	}
+
+	/**
+	 * get the id of the last ran job
+	 *
+	 * @return int
+	 */
+	public function getLastJob() {
+		return \OC_Appconfig::getValue('backgroundjob', 'lastjob', 0);
+	}
+
+	/**
+	 * set the lastRun of $job to now
+	 *
+	 * @param Job $job
+	 */
+	public function setLastRun($job) {
+		$query = \OC_DB::prepare('UPDATE `*PREFIX*jobs` SET `last_run` = ? WHERE `id` = ?');
+		$query->execute(array(time(), $job->getId()));
+	}
+}
diff --git a/lib/backgroundjob/legacy/queuedjob.php b/lib/backgroundjob/legacy/queuedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..2bc001103b8607008d1dbb27a6466555a51880cb
--- /dev/null
+++ b/lib/backgroundjob/legacy/queuedjob.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob\Legacy;
+
+class QueuedJob extends \OC\BackgroundJob\QueuedJob {
+	public function run($argument) {
+		$class = $argument['klass'];
+		$method = $argument['method'];
+		$parameters = $argument['parameters'];
+		call_user_func(array($class, $method), $parameters);
+	}
+}
diff --git a/lib/backgroundjob/legacy/regularjob.php b/lib/backgroundjob/legacy/regularjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4cfa348ceace0ecd286df18d6d2a2f51bafa592
--- /dev/null
+++ b/lib/backgroundjob/legacy/regularjob.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob\Legacy;
+
+class RegularJob extends \OC\BackgroundJob\Job {
+	public function run($argument) {
+		call_user_func($argument);
+	}
+}
diff --git a/lib/backgroundjob/queuedjob.php b/lib/backgroundjob/queuedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..1714182820df3d8ba6c8e32cf5b72e4ae90eb4ae
--- /dev/null
+++ b/lib/backgroundjob/queuedjob.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+/**
+ * Class QueuedJob
+ *
+ * create a background job that is to be executed once
+ *
+ * @package OC\BackgroundJob
+ */
+abstract class QueuedJob extends Job {
+	/**
+	 * run the job, then remove it from the joblist
+	 *
+	 * @param JobList $jobList
+	 */
+	public function execute($jobList) {
+		$jobList->remove($this);
+		$this->run($this->argument);
+	}
+}
diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
deleted file mode 100644
index b2ce6f39ed8ed365346e0508f400b592baf23837..0000000000000000000000000000000000000000
--- a/lib/backgroundjob/queuedtask.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages our queued tasks.
- */
-class OC_BackgroundJob_QueuedTask{
-	/**
-	 * @brief Gets one queued task
-	 * @param $id ID of the task
-	 * @return associative array
-	 */
-	public static function find( $id ) {
-		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
-		$result = $stmt->execute(array($id));
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Gets all queued tasks
-	 * @return array with associative arrays
-	 */
-	public static function all() {
-		// Array for objects
-		$return = array();
-
-		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks`' );
-		$result = $stmt->execute(array());
-		while( $row = $result->fetchRow()) {
-			$return[] = $row;
-		}
-
-		return $return;
-	}
-
-	/**
-	 * @brief Gets all queued tasks of a specific app
-	 * @param $app app name
-	 * @return array with associative arrays
-	 */
-	public static function whereAppIs( $app ) {
-		// Array for objects
-		$return = array();
-
-		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `app` = ?' );
-		$result = $stmt->execute(array($app));
-		while( $row = $result->fetchRow()) {
-			$return[] = $row;
-		}
-
-		// Und weg damit
-		return $return;
-	}
-
-	/**
-	 * @brief queues a task
-	 * @param $app app name
-	 * @param $klass class name
-	 * @param $method method name
-	 * @param $parameters all useful data as text
-	 * @return id of task
-	 */
-	public static function add( $app, $klass, $method, $parameters ) {
-		$stmt = OC_DB::prepare( 'INSERT INTO `*PREFIX*queuedtasks` (`app`, `klass`, `method`, `parameters`)'
-			.' VALUES(?,?,?,?)' );
-		$result = $stmt->execute(array($app, $klass, $method, $parameters ));
-
-		return OC_DB::insertid();
-	}
-
-	/**
-	 * @brief deletes a queued task
-	 * @param $id id of task
-	 * @return true/false
-	 *
-	 * Deletes a report
-	 */
-	public static function delete( $id ) {
-		$stmt = OC_DB::prepare( 'DELETE FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
-		$result = $stmt->execute(array($id));
-
-		return true;
-	}
-}
diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
deleted file mode 100644
index 9976872ee13f75f4005fb7bd8fc5a813c2f4715d..0000000000000000000000000000000000000000
--- a/lib/backgroundjob/regulartask.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class manages the regular tasks.
- */
-class OC_BackgroundJob_RegularTask{
-	static private $registered = array();
-
-	/**
-	 * @brief creates a regular task
-	 * @param $klass class name
-	 * @param $method method name
-	 * @return true
-	 */
-	static public function register( $klass, $method ) {
-		// Create the data structure
-		self::$registered["$klass-$method"] = array( $klass, $method );
-
-		// No chance for failure ;-)
-		return true;
-	}
-
-	/**
-	 * @brief gets all regular tasks
-	 * @return associative array
-	 *
-	 * key is string "$klass-$method", value is array( $klass, $method )
-	 */
-	static public function all() {
-		return self::$registered;
-	}
-}
diff --git a/lib/backgroundjob/timedjob.php b/lib/backgroundjob/timedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae9f33505abe169a5d04472e6052476831d11d2b
--- /dev/null
+++ b/lib/backgroundjob/timedjob.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\BackgroundJob;
+
+/**
+ * Class QueuedJob
+ *
+ * create a background job that is to be executed at an interval
+ *
+ * @package OC\BackgroundJob
+ */
+abstract class TimedJob extends Job {
+	protected $interval = 0;
+
+	/**
+	 * set the interval for the job
+	 *
+	 * @param int $interval
+	 */
+	public function setInterval($interval) {
+		$this->interval = $interval;
+	}
+
+	/**
+	 * run the job if
+	 *
+	 * @param JobList $jobList
+	 */
+	public function execute($jobList) {
+		if ((time() - $this->lastRun) > $this->interval) {
+			$jobList->setLastRun($this);
+			$this->run($this->argument);
+		}
+	}
+}
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
deleted file mode 100644
index e966ac9647c0fc90601bc58915c2e02ce0906d11..0000000000000000000000000000000000000000
--- a/lib/backgroundjob/worker.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * This class does the dirty work.
- *
- * TODO: locking in doAllSteps
- */
-class OC_BackgroundJob_Worker{
-	/**
-	 * @brief executes all tasks
-	 * @return boolean
-	 *
-	 * This method executes all regular tasks and then all queued tasks.
-	 * This method should be called by cli scripts that do not let the user
-	 * wait.
-	 */
-	public static function doAllSteps() {
-		// Do our regular work
-		$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
-
-		$regular_tasks = OC_BackgroundJob_RegularTask::all();
-		ksort( $regular_tasks );
-		foreach( $regular_tasks as $key => $value ) {
-			if( strcmp( $key, $lasttask ) > 0 ) {
-				// Set "restart here" config value
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
-				call_user_func( $value );
-			}
-		}
-		// Reset "start here" config value
-		OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
-
-		// Do our queued tasks
-		$queued_tasks = OC_BackgroundJob_QueuedTask::all();
-		foreach( $queued_tasks as $task ) {
-			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
-			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief does a single task
-	 * @return boolean
-	 *
-	 * This method executes one task. It saves the last state and continues
-	 * with the next step. This method should be used by webcron and ajax
-	 * services.
-	 */
-	public static function doNextStep() {
-		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-
-		if( $laststep == 'regular_tasks' ) {
-			// get last app
-			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
-
-			// What's the next step?
-			$regular_tasks = OC_BackgroundJob_RegularTask::all();
-			ksort( $regular_tasks );
-			$done = false;
-
-			// search for next background job
-			foreach( $regular_tasks as $key => $value ) {
-				if( strcmp( $key, $lasttask ) > 0 ) {
-					OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
-					$done = true;
-					call_user_func( $value );
-					break;
-				}
-			}
-
-			if( $done == false ) {
-				// Next time load queued tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'queued_tasks' );
-			}
-		}
-		else{
-			$tasks = OC_BackgroundJob_QueuedTask::all();
-			if( count( $tasks )) {
-				$task = $tasks[0];
-				// delete job before we execute it. This prevents endless loops
-				// of failing jobs.
-				OC_BackgroundJob_QueuedTask::delete($task['id']);
-
-				// execute job
-				call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
-			}
-			else{
-				// Next time load queued tasks
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
-			}
-		}
-
-		return true;
-	}
-}
diff --git a/lib/base.php b/lib/base.php
index dde994a7e5775b7ee4f01249c5d59369afd40a14..a6e4a47dbf5381dfeba82fa67932d071724c3960 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -75,54 +75,14 @@ class OC {
 	protected static $router = null;
 
 	/**
-	 * SPL autoload
+	 * @var \OC\Session\Session
 	 */
-	public static function autoload($className) {
-		$className = trim($className, '\\');
-		
-		if (array_key_exists($className, OC::$CLASSPATH)) {
-			$path = OC::$CLASSPATH[$className];
-			/** @TODO: Remove this when necessary
-			Remove "apps/" from inclusion path for smooth migration to mutli app dir
-			 */
-			if (strpos($path, 'apps/') === 0) {
-				OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
-				$path = str_replace('apps/', '', $path);
-			}
-		} elseif (strpos($className, 'OC_') === 0) {
-			$path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
-		} elseif (strpos($className, 'OC\\') === 0) {
-			$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-		} elseif (strpos($className, 'OCP\\') === 0) {
-			$path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-		} elseif (strpos($className, 'OCA\\') === 0) {
-			foreach (self::$APPSROOTS as $appDir) {
-				$path = $appDir['path'] . '/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-				$fullPath = stream_resolve_include_path($path);
-				if (file_exists($fullPath)) {
-					require_once $fullPath;
-					return false;
-				}
-			}
-		} elseif (strpos($className, 'Sabre_') === 0) {
-			$path = str_replace('_', '/', $className) . '.php';
-		} elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
-			$path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
-		} elseif (strpos($className, 'Sabre\\VObject') === 0) {
-			$path = str_replace('\\', '/', $className) . '.php';
-		} elseif (strpos($className, 'Test_') === 0) {
-			$path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
-		} elseif (strpos($className, 'Test\\') === 0) {
-			$path = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($className, 5)) . '.php');
-		} else {
-			return false;
-		}
+	public static $session = null;
 
-		if ($fullPath = stream_resolve_include_path($path)) {
-			require_once $fullPath;
-		}
-		return false;
-	}
+	/**
+	 * @var \OC\Autoloader $loader
+	 */
+	public static $loader = null;
 
 	public static function initPaths() {
 		// calculate the root directories
@@ -278,7 +238,7 @@ class OC {
 					OC_Config::setValue('maintenance', true);
 					OC_Log::write('core',
 						'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion,
-						OC_Log::DEBUG);
+						OC_Log::WARN);
 					$minimizerCSS = new OC_Minimizer_CSS();
 					$minimizerCSS->clearCache();
 					$minimizerJS = new OC_Minimizer_JS();
@@ -298,13 +258,16 @@ class OC {
 
 	public static function initTemplateEngine() {
 		// Add the stuff we need always
-		OC_Util::addScript("jquery-1.7.2.min");
+		OC_Util::addScript("jquery-1.10.0.min");
+		OC_Util::addScript("jquery-migrate-1.2.1.min");
 		OC_Util::addScript("jquery-ui-1.10.0.custom");
 		OC_Util::addScript("jquery-showpassword");
 		OC_Util::addScript("jquery.infieldlabel");
 		OC_Util::addScript("jquery-tipsy");
 		OC_Util::addScript("compatibility");
+		OC_Util::addScript("jquery.ocdialog");
 		OC_Util::addScript("oc-dialogs");
+		OC_Util::addScript("octemplate");
 		OC_Util::addScript("js");
 		OC_Util::addScript("eventsource");
 		OC_Util::addScript("config");
@@ -316,6 +279,7 @@ class OC {
 		OC_Util::addStyle("multiselect");
 		OC_Util::addStyle("jquery-ui-1.10.0.custom");
 		OC_Util::addStyle("jquery-tipsy");
+		OC_Util::addStyle("jquery.ocdialog");
 		OC_Util::addScript("oc-requesttoken");
 	}
 
@@ -324,16 +288,20 @@ class OC {
 		ini_set('session.cookie_httponly', '1;');
 
 		// set the cookie path to the ownCloud directory
-		ini_set('session.cookie_path', OC::$WEBROOT);
-
-		// set the session name to the instance id - which is unique
-		session_name(OC_Util::getInstanceId());
-
-		// if session cant be started break with http 500 error
-		if (session_start() === false){
-			OC_Log::write('core', 'Session could not be initialized', 
+		$cookie_path = OC::$WEBROOT ?: '/';
+		ini_set('session.cookie_path', $cookie_path);
+
+		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);
-			
+
 			header('HTTP/1.1 500 Internal Server Error');
 			OC_Util::addStyle("styles");
 			$error = 'Session could not be initialized. Please contact your ';
@@ -347,23 +315,24 @@ class OC {
 		}
 
 		// regenerate session id periodically to avoid session fixation
-		if (!isset($_SESSION['SID_CREATED'])) {
-			$_SESSION['SID_CREATED'] = time();
-		} else if (time() - $_SESSION['SID_CREATED'] > 60*60*12) {
+		if (!self::$session->exists('SID_CREATED')) {
+			self::$session->set('SID_CREATED', time());
+		} else if (time() - self::$session->get('SID_CREATED') > 60*60*12) {
 			session_regenerate_id(true);
-			$_SESSION['SID_CREATED'] = time();
+			self::$session->set('SID_CREATED', time());
 		}
 
 		// session timeout
-		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 60*60*24)) {
+		if (self::$session->exists('LAST_ACTIVITY') && (time() - self::$session->get('LAST_ACTIVITY') > 60*60*24)) {
 			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), '', time() - 42000, OC::$WEBROOT);
+				setcookie(session_name(), '', time() - 42000, $cookie_path);
 			}
 			session_unset();
 			session_destroy();
 			session_start();
 		}
-		$_SESSION['LAST_ACTIVITY'] = time();
+
+		self::$session->set('LAST_ACTIVITY', time());
 	}
 
 	public static function getRouter() {
@@ -388,8 +357,14 @@ class OC {
 
 	public static function init() {
 		// register autoloader
-		spl_autoload_register(array('OC', 'autoload'));
-		OC_Util::issetlocaleworking();
+		require_once __DIR__ . '/autoloader.php';
+		self::$loader=new \OC\Autoloader();
+		self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
+		self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
+		self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
+		self::$loader->registerPrefix('Sabre\\VObject', '3rdparty');
+		self::$loader->registerPrefix('Sabre_', '3rdparty');
+		spl_autoload_register(array(self::$loader, 'load'));
 
 		// set some stuff
 		//ob_start();
@@ -446,6 +421,7 @@ class OC {
 		}
 
 		self::initPaths();
+		OC_Util::issetlocaleworking();
 
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
@@ -466,11 +442,15 @@ class OC {
 		stream_wrapper_register('close', 'OC\Files\Stream\Close');
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
+		self::initTemplateEngine();
+		if ( !self::$CLI ) {
+			self::initSession();
+		} else {
+			self::$session = new \OC\Session\Memory('');
+		}
 		self::checkConfig();
 		self::checkInstalled();
 		self::checkSSL();
-		self::initSession();
-		self::initTemplateEngine();
 
 		$errors = OC_Util::checkServer();
 		if (count($errors) > 0) {
@@ -480,14 +460,14 @@ class OC {
 
 		// User and Groups
 		if (!OC_Config::getValue("installed", false)) {
-			$_SESSION['user_id'] = '';
+			self::$session->set('user_id','');
 		}
 
 		OC_User::useBackend(new OC_User_Database());
 		OC_Group::useBackend(new OC_Group_Database());
 
-		if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id'])
-			&& $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
+		if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('user_id')
+			&& $_SERVER['PHP_AUTH_USER'] != self::$session->get('user_id')) {
 			OC_User::logout();
 		}
 
@@ -559,9 +539,15 @@ class OC {
 	 * register hooks for the cache
 	 */
 	public static function registerCacheHooks() {
-		// register cache cleanup jobs
-		OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
-		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+		if (OC_Config::getValue('installed', false)) { //don't try to do this before we are properly setup
+			// register cache cleanup jobs
+			try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception
+				\OCP\BackgroundJob::registerJob('OC_Cache_FileGlobalGC');
+			} catch (Exception $e) {
+
+			}
+			OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+		}
 	}
 
 	/**
@@ -577,10 +563,12 @@ class OC {
 	 * register hooks for sharing
 	 */
 	public static function registerShareHooks() {
-		OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
-		OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
-		OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
-		OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+		if(\OC_Config::getValue('installed')) {
+			OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+			OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+		}
 	}
 
 	/**
@@ -630,8 +618,13 @@ class OC {
 		// Handle redirect URL for logged in users
 		if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
 			$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
-			header('Location: ' . $location);
-			return;
+
+			// Deny the redirect if the URL contains a @
+			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
+			if (strpos($location, '@') === false) {
+				header('Location: ' . $location);
+				return;
+			}
 		}
 		// Handle WebDAV
 		if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
@@ -775,7 +768,7 @@ class OC {
 		if (OC_User::login($_POST["user"], $_POST["password"])) {
 			// setting up the time zone
 			if (isset($_POST['timezone-offset'])) {
-				$_SESSION['timezone'] = $_POST['timezone-offset'];
+				self::$session->set('timezone', $_POST['timezone-offset']);
 			}
 
 			self::cleanupLoginTokens($_POST['user']);
diff --git a/lib/cache/file.php b/lib/cache/file.php
index f9ecf41dcacf91f63da8f759434356f086e5574a..531e1d50f40490aa370d14a297cf3bb552cdf450 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -14,6 +14,7 @@ class OC_Cache_File{
 			return $this->storage;
 		}
 		if(OC_User::isLoggedIn()) {
+			\OC\Files\Filesystem::initMountPoints(OC_User::getUser());
 			$subdir = 'cache';
 			$view = new \OC\Files\View('/'.OC_User::getUser());
 			if(!$view->file_exists($subdir)) {
diff --git a/lib/cache/fileglobalgc.php b/lib/cache/fileglobalgc.php
new file mode 100644
index 0000000000000000000000000000000000000000..a29c31f9063087a49dd9d0d3c498d1e1fe23e68d
--- /dev/null
+++ b/lib/cache/fileglobalgc.php
@@ -0,0 +1,8 @@
+<?php
+
+
+class OC_Cache_FileGlobalGC extends \OC\BackgroundJob\Job{
+	public function run($argument){
+		OC_Cache_FileGlobal::gc();
+	}
+}
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 360c3066d05086e2687b139f8a80a705683d1251..1ffa048d6b23b8725538ee5c80673ae18ea6cb93 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -101,7 +101,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	/**
 	 * @brief Ensure that the fileinfo cache is filled
-	 & @note Uses OC_FileCache or a direct stat
+	 * @note Uses OC_FileCache or a direct stat
 	 */
 	protected function getFileinfoCache() {
 		if (!isset($this->fileinfo_cache)) {
diff --git a/lib/db.php b/lib/db.php
index 8f6f50bda6e3c51738586b55e4f6512d48a164c2..618365518331c20798c805352eb92c0e4e1a9801 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -273,18 +273,13 @@ class OC_DB {
 					break;
 				case 'oci':
 					$dsn = array(
-							'phptype'  => 'oci8',
-							'username' => $user,
-							'password' => $pass,
-							'charset' => 'AL32UTF8',
+						'phptype'  => 'oci8',
+						'username' => $user,
+						'password' => $pass,
+						'service'  => $name,
+						'hostspec' => $host,
+						'charset' => 'AL32UTF8',
 					);
-					if ($host != '') {
-						$dsn['hostspec'] = $host;
-						$dsn['database'] = $name;
-					} else { // use dbname for hostspec
-						$dsn['hostspec'] = $name;
-						$dsn['database'] = $user;
-					}
 					break;
 				case 'mssql':
 					$dsn = array(
diff --git a/lib/files.php b/lib/files.php
index 04ba51d9d2404727a1c29f1bd287bcdb64ea8479..abb1617c25ee85709a618e79fdaab0971da3e411 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -59,11 +59,7 @@ class OC_Files {
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
 			$zip = new ZipArchive();
-			if ($xsendfile) {
-				$filename = OC_Helper::tmpFileNoClean('.zip');
-			}else{
-				$filename = OC_Helper::tmpFile('.zip');
-			}
+			$filename = OC_Helper::tmpFile('.zip');
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
 				exit("cannot open <$filename>\n");
 			}
@@ -78,6 +74,9 @@ class OC_Files {
 				}
 			}
 			$zip->close();
+			if ($xsendfile) {
+				$filename = OC_Helper::moveToNoClean($filename);
+			}
 			$basename = basename($dir);
 			if ($basename) {
 				$name = $basename . '.zip';
@@ -91,17 +90,16 @@ class OC_Files {
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
 			$zip = new ZipArchive();
-			if ($xsendfile) {
-				$filename = OC_Helper::tmpFileNoClean('.zip');
-			}else{
-				$filename = OC_Helper::tmpFile('.zip');
-			}
+			$filename = OC_Helper::tmpFile('.zip');
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
 				exit("cannot open <$filename>\n");
 			}
 			$file = $dir . '/' . $files;
 			self::zipAddDir($file, $zip);
 			$zip->close();
+			if ($xsendfile) {
+				$filename = OC_Helper::moveToNoClean($filename);
+			}
 			$name = $files . '.zip';
 			set_time_limit($executionTime);
 		} else {
@@ -125,8 +123,11 @@ class OC_Files {
 				header('Content-Length: ' . filesize($filename));
 				self::addSendfileHeader($filename);
 			}else{
+				$filesize = \OC\Files\Filesystem::filesize($filename);
 				header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
-				header("Content-Length: ".\OC\Files\Filesystem::filesize($filename));
+				if ($filesize > -1) {
+					header("Content-Length: ".$filesize);
+				}
 				list($storage) = \OC\Files\Filesystem::resolvePath($filename);
 				if ($storage instanceof \OC\Files\Storage\Local) {
 					self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
new file mode 100644
index 0000000000000000000000000000000000000000..8933101577d5cab06c2c59425f5e386b24bffad9
--- /dev/null
+++ b/lib/files/cache/backgroundwatcher.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Cache;
+
+use \OC\Files\Mount;
+use \OC\Files\Filesystem;
+
+class BackgroundWatcher {
+	static $folderMimetype = null;
+
+	static private function getFolderMimetype() {
+		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'));
+		$row = $result->fetchRow();
+		return $row['id'];
+	}
+
+	static private function checkUpdate($id) {
+		$cacheItem = Cache::getById($id);
+		if (is_null($cacheItem)) {
+			return;
+		}
+		list($storageId, $internalPath) = $cacheItem;
+		$mounts = Filesystem::getMountByStorageId($storageId);
+
+		if (count($mounts) === 0) {
+			//if the storage we need isn't mounted on default, try to find a user that has access to the storage
+			$permissionsCache = new Permissions($storageId);
+			$users = $permissionsCache->getUsers($id);
+			if (count($users) === 0) {
+				return;
+			}
+			Filesystem::initMountPoints($users[0]);
+			$mounts = Filesystem::getMountByStorageId($storageId);
+			if (count($mounts) === 0) {
+				return;
+			}
+		}
+		$storage = $mounts[0]->getStorage();
+		$watcher = new Watcher($storage);
+		$watcher->checkUpdate($internalPath);
+	}
+
+	/**
+	 * get the next fileid in the cache
+	 *
+	 * @param int $previous
+	 * @param bool $folder
+	 * @return int
+	 */
+	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);
+		} else {
+			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype != ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1);
+		}
+		$result = $query->execute(array($previous));
+		if ($row = $result->fetchRow()) {
+			return $row['fileid'];
+		} else {
+			return 0;
+		}
+	}
+
+	static public function checkNext() {
+		// check both 1 file and 1 folder, this way new files are detected quicker because there are less folders than files usually
+		$previousFile = \OC_Appconfig::getValue('files', 'backgroundwatcher_previous_file', 0);
+		$previousFolder = \OC_Appconfig::getValue('files', 'backgroundwatcher_previous_folder', 0);
+		$nextFile = self::getNextFileId($previousFile, false);
+		$nextFolder = self::getNextFileId($previousFolder, true);
+		\OC_Appconfig::setValue('files', 'backgroundwatcher_previous_file', $nextFile);
+		\OC_Appconfig::setValue('files', 'backgroundwatcher_previous_folder', $nextFolder);
+		if ($nextFile > 0) {
+			self::checkUpdate($nextFile);
+		}
+		if ($nextFolder > 0) {
+			self::checkUpdate($nextFolder);
+		}
+	}
+
+	static public function checkAll() {
+		$previous = 0;
+		$next = 1;
+		while ($next != 0) {
+			$next = self::getNextFileId($previous, true);
+			self::checkUpdate($next);
+		}
+		$previous = 0;
+		$next = 1;
+		while ($next != 0) {
+			$next = self::getNextFileId($previous, false);
+			self::checkUpdate($next);
+		}
+	}
+}
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 71b70abe3fec5f586cf3f191e3fc8bc6b7d97c39..cae2e63e4dc18746445e582b707bb7b142175560 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -30,11 +30,9 @@ class Cache {
 	private $storageId;
 
 	/**
-	 * numeric storage id
-	 *
-	 * @var int $numericId
+	 * @var Storage $storageCache
 	 */
-	private $numericId;
+	private $storageCache;
 
 	private $mimetypeIds = array();
 	private $mimetypes = array();
@@ -52,19 +50,11 @@ class Cache {
 			$this->storageId = md5($this->storageId);
 		}
 
-		$query = \OC_DB::prepare('SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?');
-		$result = $query->execute(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));
-			$this->numericId = \OC_DB::insertid('*PREFIX*storages');
-		}
+		$this->storageCache = new Storage($storage);
 	}
 
 	public function getNumericStorageId() {
-		return $this->numericId;
+		return $this->storageCache->getNumericId();
 	}
 
 	/**
@@ -110,14 +100,17 @@ class Cache {
 	 */
 	public function get($file) {
 		if (is_string($file) or $file == '') {
+			// normalize file
+			$file = $this->normalize($file);
+
 			$where = 'WHERE `storage` = ? AND `path_hash` = ?';
-			$params = array($this->numericId, md5($file));
+			$params = array($this->getNumericStorageId(), md5($file));
 		} else { //file id
 			$where = 'WHERE `fileid` = ?';
 			$params = array($file);
 		}
 		$query = \OC_DB::prepare(
-			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
 			 FROM `*PREFIX*filecache` ' . $where);
 		$result = $query->execute($params);
 		$data = $result->fetchRow();
@@ -133,9 +126,13 @@ class Cache {
 			$data['size'] = (int)$data['size'];
 			$data['mtime'] = (int)$data['mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
+            $data['unencrypted_size'] = (int)$data['unencrypted_size'];
 			$data['storage'] = $this->storageId;
 			$data['mimetype'] = $this->getMimetype($data['mimetype']);
 			$data['mimepart'] = $this->getMimetype($data['mimepart']);
+			if ($data['storage_mtime'] == 0) {
+				$data['storage_mtime'] = $data['mtime'];
+			}
 		}
 
 		return $data;
@@ -151,13 +148,20 @@ class Cache {
 		$fileId = $this->getId($folder);
 		if ($fileId > -1) {
 			$query = \OC_DB::prepare(
-				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
-			 	 FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
+				'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);
+			}
 			$files = $result->fetchAll();
 			foreach ($files as &$file) {
 				$file['mimetype'] = $this->getMimetype($file['mimetype']);
 				$file['mimepart'] = $this->getMimetype($file['mimepart']);
+				if ($file['storage_mtime'] == 0) {
+					$file['storage_mtime'] = $file['mtime'];
+				}
 			}
 			return $files;
 		} else {
@@ -178,6 +182,9 @@ class Cache {
 			$this->update($id, $data);
 			return $id;
 		} else {
+			// normalize file
+			$file = $this->normalize($file);
+
 			if (isset($this->partial[$file])) { //add any saved partial data
 				$data = array_merge($this->partial[$file], $data);
 				unset($this->partial[$file]);
@@ -198,14 +205,14 @@ class Cache {
 
 			list($queryParts, $params) = $this->buildParts($data);
 			$queryParts[] = '`storage`';
-			$params[] = $this->numericId;
+			$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, \OCP\Util::ERROR);
+				\OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result->getMessage(), \OCP\Util::ERROR);
 			}
 
 			return (int)\OC_DB::insertid('*PREFIX*filecache');
@@ -219,6 +226,17 @@ class Cache {
 	 * @param array $data
 	 */
 	public function update($id, array $data) {
+
+		if(isset($data['path'])) {
+			// normalize path
+			$data['path'] = $this->normalize($data['path']);
+		}
+
+		if(isset($data['name'])) {
+			// normalize path
+			$data['name'] = $this->normalize($data['name']);
+		}
+
 		list($queryParts, $params) = $this->buildParts($data);
 		$params[] = $id;
 
@@ -234,7 +252,7 @@ class Cache {
 	 * @return array
 	 */
 	function buildParts(array $data) {
-		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'etag');
+		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'unencrypted_size', 'etag');
 		$params = array();
 		$queryParts = array();
 		foreach ($data as $name => $value) {
@@ -246,6 +264,11 @@ class Cache {
 					$params[] = $this->getMimetypeId(substr($value, 0, strpos($value, '/')));
 					$queryParts[] = '`mimepart`';
 					$value = $this->getMimetypeId($value);
+				} elseif ($name === 'storage_mtime') {
+					if (!isset($data['mtime'])) {
+						$params[] = $value;
+						$queryParts[] = '`mtime`';
+					}
 				}
 				$params[] = $value;
 				$queryParts[] = '`' . $name . '`';
@@ -261,10 +284,13 @@ class Cache {
 	 * @return int
 	 */
 	public function getId($file) {
+		// normalize file
+		$file = $this->normalize($file);
+
 		$pathHash = md5($file);
 
 		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
-		$result = $query->execute(array($this->numericId, $pathHash));
+		$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
 
 		if ($row = $result->fetchRow()) {
 			return $row['fileid'];
@@ -328,19 +354,26 @@ class Cache {
 	 * @param string $target
 	 */
 	public function move($source, $target) {
-		$sourceId = $this->getId($source);
-		$newParentId = $this->getParentId($target);
+		// normalize source and target
+		$source = $this->normalize($source);
+		$target = $this->normalize($target);
 
-		//find all child entries
-		$query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `path` LIKE ?');
-		$result = $query->execute(array($source . '/%'));
-		$childEntries = $result->fetchAll();
-		$sourceLength = strlen($source);
-		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
+		$sourceData = $this->get($source);
+		$sourceId = $sourceData['fileid'];
+		$newParentId = $this->getParentId($target);
 
-		foreach ($childEntries as $child) {
-			$targetPath = $target . substr($child['path'], $sourceLength);
-			$query->execute(array($targetPath, md5($targetPath), $child['fileid']));
+		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 . '/%'));
+			$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']));
+			}
 		}
 
 		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =?'
@@ -353,7 +386,7 @@ class Cache {
 	 */
 	public function clear() {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE storage = ?');
-		$query->execute(array($this->numericId));
+		$query->execute(array($this->getNumericStorageId()));
 
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*storages` WHERE id = ?');
 		$query->execute(array($this->storageId));
@@ -365,9 +398,15 @@ class Cache {
 	 * @return int, Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
 	 */
 	public function getStatus($file) {
+		// normalize file
+		$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->numericId, $pathHash));
+		$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
+		if( \OC_DB::isError($result)) {
+			\OCP\Util::writeLog('cache', 'get status failed: ' . $result->getMessage(), \OCP\Util::ERROR);
+		}
 		if ($row = $result->fetchRow()) {
 			if ((int)$row['size'] === -1) {
 				return self::SHALLOW;
@@ -390,11 +429,15 @@ class Cache {
 	 * @return array of file data
 	 */
 	public function search($pattern) {
+
+		// normalize pattern
+		$pattern = $this->normalize($pattern);
+
 		$query = \OC_DB::prepare('
-			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+			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->numericId));
+		$result = $query->execute(array($pattern, $this->getNumericStorageId()));
 		$files = array();
 		while ($row = $result->fetchRow()) {
 			$row['mimetype'] = $this->getMimetype($row['mimetype']);
@@ -417,11 +460,11 @@ class Cache {
 			$where = '`mimepart` = ?';
 		}
 		$query = \OC_DB::prepare('
-			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`
+			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->numericId));
+		$result = $query->execute(array($mimetype, $this->getNumericStorageId()));
 		$files = array();
 		while ($row = $result->fetchRow()) {
 			$row['mimetype'] = $this->getMimetype($row['mimetype']);
@@ -440,7 +483,7 @@ class Cache {
 		$this->calculateFolderSize($path);
 		if ($path !== '') {
 			$parent = dirname($path);
-			if ($parent === '.') {
+			if ($parent === '.' or $parent === '/') {
 				$parent = '';
 			}
 			$this->correctFolderSize($parent);
@@ -459,7 +502,7 @@ class Cache {
 			return 0;
 		}
 		$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?');
-		$result = $query->execute(array($id, $this->numericId));
+		$result = $query->execute(array($id, $this->getNumericStorageId()));
 		$totalSize = 0;
 		$hasChilds = 0;
 		while ($row = $result->fetchRow()) {
@@ -486,7 +529,7 @@ class Cache {
 	 */
 	public function getAll() {
 		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?');
-		$result = $query->execute(array($this->numericId));
+		$result = $query->execute(array($this->getNumericStorageId()));
 		$ids = array();
 		while ($row = $result->fetchRow()) {
 			$ids[] = $row['fileid'];
@@ -505,8 +548,11 @@ class Cache {
 	 */
 	public function getIncomplete() {
 		$query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`'
-			. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
-		$result = $query->execute(array($this->numericId));
+			. ' 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);
+		}
 		if ($row = $result->fetchRow()) {
 			return $row['path'];
 		} else {
@@ -517,6 +563,7 @@ class Cache {
 	/**
 	 * get the storage id of the storage for a file and the internal path of the file
 	 *
+	 * @param int $id
 	 * @return array, first element holding the storage id, second the path
 	 */
 	static public function getById($id) {
@@ -529,12 +576,20 @@ class Cache {
 			return null;
 		}
 
-		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
-		$result = $query->execute(array($numericId));
-		if ($row = $result->fetchRow()) {
-			return array($row['id'], $path);
+		if ($id = Storage::getStorageId($numericId)) {
+			return array($id, $path);
 		} else {
 			return null;
 		}
 	}
+
+	/**
+	 * normalize the given path
+	 * @param $path
+	 * @return string
+	 */
+	public function normalize($path) {
+
+		return \OC_Util::normalizeUnicode($path);
+	}
 }
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index 9556a2639a3fdb511f567554e66e2236541386ca..b8e2548639baf4171327009f26eaa8238f839f1e 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -80,7 +80,7 @@ class Legacy {
 		}
 		$result = $query->execute(array($path));
 		$data = $result->fetchRow();
-		$data['etag'] = $this->getEtag($data['path']);
+		$data['etag'] = $this->getEtag($data['path'], $data['user']);
 		return $data;
 	}
 
@@ -90,12 +90,24 @@ class Legacy {
 	 * @param type $path
 	 * @return string
 	 */
-	function getEtag($path) {
+	function getEtag($path, $user = null) {
 		static $query = null;
-		list(, $user, , $relativePath) = explode('/', $path, 4);
-		if (is_null($relativePath)) {
+
+		$pathDetails = explode('/', $path, 4);
+		if((!$user) && !isset($pathDetails[1])) {
+			//no user!? Too odd, return empty string.
+			return '';
+		} else if(!$user) {
+			//guess user from path, if no user passed.
+			$user = $pathDetails[1];
+		}
+
+		if(!isset($pathDetails[3]) || is_null($pathDetails[3])) {
 			$relativePath = '';
+		} else {
+			$relativePath = $pathDetails[3];
 		}
+
 		if(is_null($query)){
 			$query = \OC_DB::prepare('SELECT `propertyvalue` FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = \'{DAV:}getetag\'');
 		}
@@ -118,7 +130,7 @@ class Legacy {
 		$result = $query->execute(array($id));
 		$data = $result->fetchAll();
 		foreach ($data as $i => $item) {
-			$data[$i]['etag'] = $this->getEtag($item['path']);
+			$data[$i]['etag'] = $this->getEtag($item['path'], $item['user']);
 		}
 		return $data;
 	}
diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index a5c9c144054d0e8200d688e314c7575f14a5c97f..29c30b0f36c8cb657f4bd28ea8bba4576ec9dcd5 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -85,6 +85,26 @@ class Permissions {
 		return $filePermissions;
 	}
 
+	/**
+	 * get the permissions for all files in a folder
+	 *
+	 * @param int $parentId
+	 * @param string $user
+	 * @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` = ?');
+
+		$result = $query->execute(array($parentId, $user));
+		$filePermissions = array();
+		while ($row = $result->fetchRow()) {
+			$filePermissions[$row['fileid']] = $row['permissions'];
+		}
+		return $filePermissions;
+	}
+
 	/**
 	 * remove the permissions for a file
 	 *
@@ -107,4 +127,19 @@ class Permissions {
 			$query->execute(array($fileId, $user));
 		}
 	}
+
+	/**
+	 * get the list of users which have permissions stored for a file
+	 *
+	 * @param int $fileId
+	 */
+	public function getUsers($fileId) {
+		$query = \OC_DB::prepare('SELECT `user` FROM `*PREFIX*permissions` WHERE `fileid` = ?');
+		$result = $query->execute(array($fileId));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$users[] = $row['user'];
+		}
+		return $users;
+	}
 }
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index f019d4fc608b34588ffbd9d4c5b093a9b5d3f70d..8f9a7921956f6a4c3fbc9eab9d6ef70b8ee64caf 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -51,6 +51,7 @@ class Scanner {
 			$data['size'] = $this->storage->filesize($path);
 		}
 		$data['etag'] = $this->storage->getETag($path);
+		$data['storage_mtime'] = $data['mtime'];
 		return $data;
 	}
 
@@ -62,31 +63,36 @@ class Scanner {
 	 * @return array with metadata of the scanned file
 	 */
 	public function scanFile($file, $checkExisting = false) {
-		if (!self::isIgnoredFile($file)) {
+		if ( ! self::isPartialFile($file)
+			and ! \OC\Files\Filesystem::isFileBlacklisted($file)
+		) {
 			\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 			$data = $this->getData($file);
 			if ($data) {
 				if ($file) {
 					$parent = dirname($file);
-					if ($parent === '.') {
+					if ($parent === '.' or $parent === '/') {
 						$parent = '';
 					}
 					if (!$this->cache->inCache($parent)) {
 						$this->scanFile($parent);
 					}
 				}
-				if($cacheData = $this->cache->get($file)) {
+				$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'];
 					}
+					// Only update metadata that has changed
+					$newData = array_diff($data, $cacheData);
 				}
-				if ($checkExisting and $cacheData) {
-					if ($data['size'] === -1) {
-						$data['size'] = $cacheData['size'];
-					}
+				if (!empty($newData)) {
+					$this->cache->put($file, $newData);
 				}
-				$this->cache->put($file, $data);
 			}
 			return $data;
 		}
@@ -113,7 +119,7 @@ class Scanner {
 			\OC_DB::beginTransaction();
 			while ($file = readdir($dh)) {
 				$child = ($path) ? $path . '/' . $file : $file;
-				if (!$this->isIgnoredDir($file)) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 					$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
 					if ($data) {
 						if ($data['size'] === -1) {
@@ -147,18 +153,6 @@ class Scanner {
 		return $size;
 	}
 
-	/**
-	 * @brief check if the directory should be ignored when scanning
-	 * NOTE: the special directories . and .. would cause never ending recursion
-	 * @param String $dir
-	 * @return boolean
-	 */
-	private function isIgnoredDir($dir) {
-		if ($dir === '.' || $dir === '..') {
-			return true;
-		}
-		return false;
-	}
 	/**
 	 * @brief check if the file should be ignored when scanning
 	 * NOTE: files with a '.part' extension are ignored as well!
@@ -166,10 +160,8 @@ class Scanner {
 	 * @param String $file
 	 * @return boolean
 	 */
-	public static function isIgnoredFile($file) {
-		if (pathinfo($file, PATHINFO_EXTENSION) === 'part'
-			|| \OC\Files\Filesystem::isFileBlacklisted($file)
-		) {
+	public static function isPartialFile($file) {
+		if (pathinfo($file, PATHINFO_EXTENSION) === 'part') {
 			return true;
 		}
 		return false;
@@ -179,9 +171,11 @@ class Scanner {
 	 * walk over any folders that are not fully scanned yet and scan them
 	 */
 	public function backgroundScan() {
-		while (($path = $this->cache->getIncomplete()) !== false) {
+		$lastPath = null;
+		while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
 			$this->scan($path);
 			$this->cache->correctFolderSize($path);
+			$lastPath = $path;
 		}
 	}
 }
diff --git a/lib/files/cache/storage.php b/lib/files/cache/storage.php
new file mode 100644
index 0000000000000000000000000000000000000000..72de376798cde270c7f4a507ae2244d8506d13cb
--- /dev/null
+++ b/lib/files/cache/storage.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Cache;
+
+/**
+ * Class Storage
+ *
+ * cache storage specific data
+ *
+ * @package OC\Files\Cache
+ */
+class Storage {
+	private $storageId;
+	private $numericId;
+
+	/**
+	 * @param \OC\Files\Storage\Storage|string $storage
+	 */
+	public function __construct($storage) {
+		if ($storage instanceof \OC\Files\Storage\Storage) {
+			$this->storageId = $storage->getId();
+		} else {
+			$this->storageId = $storage;
+		}
+		if (strlen($this->storageId) > 64) {
+			$this->storageId = md5($this->storageId);
+		}
+
+		$query = \OC_DB::prepare('SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?');
+		$result = $query->execute(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));
+			$this->numericId = \OC_DB::insertid('*PREFIX*storages');
+		}
+	}
+
+	public function getNumericId() {
+		return $this->numericId;
+	}
+
+	public static function getStorageId($numericId) {
+		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
+		$result = $query->execute(array($numericId));
+		if ($row = $result->fetchRow()) {
+			return $row['id'];
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/lib/files/cache/updater.php b/lib/files/cache/updater.php
index 92a16d9d9b61a86ce458e8878e6cc7e1bb1fcfff..417a47f3830d8d9c5575e0630393c0ff1f2e3a1e 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -132,7 +132,14 @@ class Updater {
 	 * @param array $params
 	 */
 	static public function touchHook($params) {
-		self::writeUpdate($params['path']);
+		$path = $params['path'];
+		list($storage, $internalPath) = self::resolvePath($path);
+		$cache = $storage->getCache();
+		$id = $cache->getId($internalPath);
+		if ($id !== -1) {
+			$cache->update($id, array('etag' => $storage->getETag($internalPath)));
+		}
+		self::writeUpdate($path);
 	}
 
 	/**
diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php
index 797f4e6ba8c5bc84ee1b552e5611f80fc317200d..ca044ba81dedef005ac0392862e0e85617c9a04e 100644
--- a/lib/files/cache/upgrade.php
+++ b/lib/files/cache/upgrade.php
@@ -127,6 +127,10 @@ class Upgrade {
 	 * @return array
 	 */
 	function getNewData($data) {
+		//Make sure there is a path, otherwise we can do nothing.
+		if(!isset($data['path'])) {
+			return false;
+		}
 		$newData = $data;
 		/**
 		 * @var \OC\Files\Storage\Storage $storage
diff --git a/lib/files/cache/watcher.php b/lib/files/cache/watcher.php
index 31059ec7f56883cd9105291c775d4f1f1d77ff13..8bfd4602f3aae9f0ee8ca0233b09be0c5faf8464 100644
--- a/lib/files/cache/watcher.php
+++ b/lib/files/cache/watcher.php
@@ -43,7 +43,7 @@ class Watcher {
 	 */
 	public function checkUpdate($path) {
 		$cachedEntry = $this->cache->get($path);
-		if ($this->storage->hasUpdated($path, $cachedEntry['mtime'])) {
+		if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) {
 			if ($this->storage->is_dir($path)) {
 				$this->scanner->scan($path, Scanner::SCAN_SHALLOW);
 			} else {
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index c8e62956f194866789494ca879f069007ff4984b..d3fddf8c421ba73f19e0d172acef4e6cf15ff669 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -34,6 +34,11 @@ const FREE_SPACE_UNKNOWN = -2;
 const FREE_SPACE_UNLIMITED = -3;
 
 class Filesystem {
+	/**
+	 * @var Mount\Manager $mounts
+	 */
+	private static $mounts;
+
 	public static $loaded = false;
 	/**
 	 * @var \OC\Files\View $defaultInstance
@@ -147,7 +152,10 @@ class Filesystem {
 	 * @return string
 	 */
 	static public function getMountPoint($path) {
-		$mount = Mount::find($path);
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		$mount = self::$mounts->find($path);
 		if ($mount) {
 			return $mount->getMountPoint();
 		} else {
@@ -162,8 +170,11 @@ class Filesystem {
 	 * @return string[]
 	 */
 	static public function getMountPoints($path) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		$result = array();
-		$mounts = Mount::findIn($path);
+		$mounts = self::$mounts->findIn($path);
 		foreach ($mounts as $mount) {
 			$result[] = $mount->getMountPoint();
 		}
@@ -177,10 +188,35 @@ class Filesystem {
 	 * @return \OC\Files\Storage\Storage
 	 */
 	public static function getStorage($mountPoint) {
-		$mount = Mount::find($mountPoint);
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		$mount = self::$mounts->find($mountPoint);
 		return $mount->getStorage();
 	}
 
+	/**
+	 * @param $id
+	 * @return Mount\Mount[]
+	 */
+	public static function getMountByStorageId($id) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		return self::$mounts->findByStorageId($id);
+	}
+
+	/**
+	 * @param $id
+	 * @return Mount\Mount[]
+	 */
+	public static function getMountByNumericId($id) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		return self::$mounts->findByNumericId($id);
+	}
+
 	/**
 	 * resolve a path to a storage and internal path
 	 *
@@ -188,7 +224,10 @@ class Filesystem {
 	 * @return array consisting of the storage and the internal path
 	 */
 	static public function resolvePath($path) {
-		$mount = Mount::find($path);
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		$mount = self::$mounts->find($path);
 		if ($mount) {
 			return array($mount->getStorage(), $mount->getInternalPath($path));
 		} else {
@@ -202,6 +241,10 @@ class Filesystem {
 		}
 		self::$defaultInstance = new View($root);
 
+		if (!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
+
 		//load custom mount config
 		self::initMountPoints($user);
 
@@ -210,6 +253,12 @@ class Filesystem {
 		return true;
 	}
 
+	static public function initMounts() {
+		if (!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
+	}
+
 	/**
 	 * Initialize system and personal mount points for a user
 	 *
@@ -287,9 +336,9 @@ class Filesystem {
 	}
 
 	/**
-	 * fill in the correct values for $user, and $password placeholders
+	 * fill in the correct values for $user
 	 *
-	 * @param string $input
+	 * @param string $user
 	 * @param string $input
 	 * @return string
 	 */
@@ -311,6 +360,7 @@ class Filesystem {
 	 */
 	static public function tearDown() {
 		self::clearMounts();
+		self::$defaultInstance = null;
 	}
 
 	/**
@@ -327,7 +377,9 @@ class Filesystem {
 	 * clear all mounts and storage backends
 	 */
 	public static function clearMounts() {
-		Mount::clear();
+		if (self::$mounts) {
+			self::$mounts->clear();
+		}
 	}
 
 	/**
@@ -338,7 +390,11 @@ class Filesystem {
 	 * @param string $mountpoint
 	 */
 	static public function mount($class, $arguments, $mountpoint) {
-		new Mount($class, $mountpoint, $arguments);
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
+		$mount = new Mount\Mount($class, $mountpoint, $arguments);
+		self::$mounts->addMount($mount);
 	}
 
 	/**
@@ -422,6 +478,19 @@ class Filesystem {
 		return (in_array($filename, $blacklist));
 	}
 
+	/**
+	 * @brief check if the directory should be ignored when scanning
+	 * NOTE: the special directories . and .. would cause never ending recursion
+	 * @param String $dir
+	 * @return boolean
+	 */
+	static public function isIgnoredDir($dir) {
+		if ($dir === '.' || $dir === '..') {
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
 	 */
@@ -585,9 +654,8 @@ class Filesystem {
 			$path = substr($path, 0, -1);
 		}
 		//normalize unicode if possible
-		if (class_exists('Normalizer')) {
-			$path = \Normalizer::normalize($path);
-		}
+		$path = \OC_Util::normalizeUnicode($path);
+
 		return $path;
 	}
 
@@ -665,9 +733,4 @@ class Filesystem {
 	}
 }
 
-\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
-\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
-\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_Util::setupFS();
diff --git a/lib/files/mount/manager.php b/lib/files/mount/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..25a5fe241cc131bc2b76aa401b95de9a97054ef9
--- /dev/null
+++ b/lib/files/mount/manager.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Mount;
+
+use \OC\Files\Filesystem;
+
+class Manager {
+	/**
+	 * @var Mount[]
+	 */
+	private $mounts = array();
+
+	/**
+	 * @param Mount $mount
+	 */
+	public function addMount($mount) {
+		$this->mounts[$mount->getMountPoint()] = $mount;
+	}
+
+	/**
+	 * Find the mount for $path
+	 *
+	 * @param $path
+	 * @return Mount
+	 */
+	public function find($path) {
+		\OC_Util::setupFS();
+		$path = $this->formatPath($path);
+		if (isset($this->mounts[$path])) {
+			return $this->mounts[$path];
+		}
+
+		\OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
+		$foundMountPoint = '';
+		$mountPoints = array_keys($this->mounts);
+		foreach ($mountPoints as $mountpoint) {
+			if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
+				$foundMountPoint = $mountpoint;
+			}
+		}
+		if (isset($this->mounts[$foundMountPoint])) {
+			return $this->mounts[$foundMountPoint];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Find all mounts in $path
+	 *
+	 * @param $path
+	 * @return Mount[]
+	 */
+	public function findIn($path) {
+		\OC_Util::setupFS();
+		$path = $this->formatPath($path);
+		$result = array();
+		$pathLength = strlen($path);
+		$mountPoints = array_keys($this->mounts);
+		foreach ($mountPoints as $mountPoint) {
+			if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
+				$result[] = $this->mounts[$mountPoint];
+			}
+		}
+		return $result;
+	}
+
+	public function clear() {
+		$this->mounts = array();
+	}
+
+	/**
+	 * Find mounts by storage id
+	 *
+	 * @param string $id
+	 * @return Mount[]
+	 */
+	public function findByStorageId($id) {
+		\OC_Util::setupFS();
+		if (strlen($id) > 64) {
+			$id = md5($id);
+		}
+		$result = array();
+		foreach ($this->mounts as $mount) {
+			if ($mount->getStorageId() === $id) {
+				$result[] = $mount;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Find mounts by numeric storage id
+	 *
+	 * @param string $id
+	 * @return Mount
+	 */
+	public function findByNumericId($id) {
+		$storageId = \OC\Files\Cache\Storage::getStorageId($id);
+		return $this->findByStorageId($storageId);
+	}
+
+	/**
+	 * @param string $path
+	 * @return string
+	 */
+	private function formatPath($path) {
+		$path = Filesystem::normalizePath($path);
+		if (strlen($path) > 1) {
+			$path .= '/';
+		}
+		return $path;
+	}
+}
diff --git a/lib/files/mount.php b/lib/files/mount/mount.php
similarity index 54%
rename from lib/files/mount.php
rename to lib/files/mount/mount.php
index 59c98e9dcc8e651ca8b874408f6bd338a25bac27..69b8285ab4c210fd7fbffbb761a2dba1a28320dd 100644
--- a/lib/files/mount.php
+++ b/lib/files/mount/mount.php
@@ -6,13 +6,12 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Files;
+namespace OC\Files\Mount;
+
+use \OC\Files\Filesystem;
 
 class Mount {
-	/**
-	 * @var Mount[]
-	 */
-	static private $mounts = array();
+
 
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
@@ -33,7 +32,7 @@ class Mount {
 			$arguments = array();
 		}
 
-		$mountpoint = self::formatPath($mountpoint);
+		$mountpoint = $this->formatPath($mountpoint);
 		if ($storage instanceof \OC\Files\Storage\Storage) {
 			$this->class = get_class($storage);
 			$this->storage = $storage;
@@ -46,8 +45,6 @@ class Mount {
 			$this->arguments = $arguments;
 		}
 		$this->mountPoint = $mountpoint;
-
-		self::$mounts[$this->mountPoint] = $this;
 	}
 
 	/**
@@ -58,6 +55,8 @@ class Mount {
 	}
 
 	/**
+	 * create the storage that is mounted
+	 *
 	 * @return \OC\Files\Storage\Storage
 	 */
 	private function createStorage() {
@@ -121,100 +120,11 @@ class Mount {
 	 * @param string $path
 	 * @return string
 	 */
-	private static function formatPath($path) {
+	private function formatPath($path) {
 		$path = Filesystem::normalizePath($path);
 		if (strlen($path) > 1) {
 			$path .= '/';
 		}
 		return $path;
 	}
-
-	/**
-	 * Find the mount for $path
-	 *
-	 * @param $path
-	 * @return Mount
-	 */
-	public static function find($path) {
-		$path = self::formatPath($path);
-		if (isset(self::$mounts[$path])) {
-			return self::$mounts[$path];
-		}
-
-		\OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
-		$foundMountPoint = '';
-		$mountPoints = array_keys(self::$mounts);
-		foreach ($mountPoints as $mountpoint) {
-			if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
-				$foundMountPoint = $mountpoint;
-			}
-		}
-		if (isset(self::$mounts[$foundMountPoint])) {
-			return self::$mounts[$foundMountPoint];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Find all mounts in $path
-	 *
-	 * @param $path
-	 * @return Mount[]
-	 */
-	public static function findIn($path) {
-		$path = self::formatPath($path);
-		$result = array();
-		$pathLength = strlen($path);
-		$mountPoints = array_keys(self::$mounts);
-		foreach ($mountPoints as $mountPoint) {
-			if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
-				$result[] = self::$mounts[$mountPoint];
-			}
-		}
-		return $result;
-	}
-
-	public static function clear() {
-		self::$mounts = array();
-	}
-
-	/**
-	 * Find mounts by storage id
-	 *
-	 * @param string $id
-	 * @return Mount[]
-	 */
-	public static function findByStorageId($id) {
-		if (strlen($id) > 64) {
-			$id = md5($id);
-		}
-		$result = array();
-		foreach (self::$mounts as $mount) {
-			if ($mount->getStorageId() === $id) {
-				$result[] = $mount;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Find mounts by numeric storage id
-	 *
-	 * @param string $id
-	 * @return Mount
-	 */
-	public static function findByNumericId($id) {
-		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
-		$result = $query->execute(array($id))->fetchOne();
-		if ($result) {
-			$id = $result;
-			foreach (self::$mounts as $mount) {
-				if ($mount->getStorageId() === $id) {
-					return $mount;
-				}
-			}
-		}
-		return false;
-	}
 }
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 38fe5e546f6be008daa43ad64a6cfc870afb8aa7..3da13ac4df05306165b9f4a1e74908f468fcf7eb 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -25,6 +25,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	private $scanner;
 	private $permissioncache;
 	private $watcher;
+	private $storageCache;
 
 	public function __construct($parameters) {
 	}
@@ -137,27 +138,21 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	 */
 	public function deleteAll($directory, $empty = false) {
 		$directory = trim($directory, '/');
-
-		if (!$this->file_exists(\OCP\USER::getUser() . '/' . $directory)
-			|| !$this->is_dir(\OCP\USER::getUser() . '/' . $directory)
-		) {
-			return false;
-		} elseif (!$this->isReadable(\OCP\USER::getUser() . '/' . $directory)) {
+		if (!$this->is_dir($directory) || !$this->isReadable($directory)) {
 			return false;
 		} else {
-			$directoryHandle = $this->opendir(\OCP\USER::getUser() . '/' . $directory);
+			$directoryHandle = $this->opendir($directory);
 			while ($contents = readdir($directoryHandle)) {
-				if ($contents != '.' && $contents != '..') {
-					$path = $directory . "/" . $contents;
+				if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
+					$path = $directory . '/' . $contents;
 					if ($this->is_dir($path)) {
 						$this->deleteAll($path);
 					} else {
-						$this->unlink(\OCP\USER::getUser() . '/' . $path); // TODO: make unlink use same system path as is_dir
+						$this->unlink($path);
 					}
 				}
 			}
-			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
-			if ($empty == false) {
+			if ($empty === false) {
 				if (!$this->rmdir($directory)) {
 					return false;
 				}
@@ -300,6 +295,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		return $this->watcher;
 	}
 
+	public function getStorageCache(){
+		if (!isset($this->storageCache)) {
+			$this->storageCache = new \OC\Files\Cache\Storage($this);
+		}
+		return $this->storageCache;
+	}
+
 	/**
 	 * get the owner of a path
 	 *
@@ -361,7 +363,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	 * get the free space in the storage
 	 *
 	 * @param $path
-	 * return int
+	 * @return int
 	 */
 	public function free_space($path) {
 		return \OC\Files\FREE_SPACE_UNKNOWN;
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index 81e32587fca4be27be62cd761538031f64a97dcc..d684905bf9a4e5856762f1ffe44076234dc55311 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -14,252 +14,277 @@ if (\OC_Util::runningOnWindows()) {
 	}
 } else {
 
-/**
- * for local filestore, we only have to map the paths
- */
-class Local extends \OC\Files\Storage\Common{
-	protected $datadir;
-	public function __construct($arguments) {
-		$this->datadir=$arguments['datadir'];
-		if(substr($this->datadir, -1)!=='/') {
-			$this->datadir.='/';
+	/**
+	 * for local filestore, we only have to map the paths
+	 */
+	class Local extends \OC\Files\Storage\Common {
+		protected $datadir;
+
+		public function __construct($arguments) {
+			$this->datadir = $arguments['datadir'];
+			if (substr($this->datadir, -1) !== '/') {
+				$this->datadir .= '/';
+			}
 		}
-	}
-	public function __destruct() {
-	}
-	public function getId(){
-		return 'local::'.$this->datadir;
-	}
-	public function mkdir($path) {
-		return @mkdir($this->datadir.$path);
-	}
-	public function rmdir($path) {
-		return @rmdir($this->datadir.$path);
-	}
-	public function opendir($path) {
-		return opendir($this->datadir.$path);
-	}
-	public function is_dir($path) {
-		if(substr($path, -1)=='/') {
-			$path=substr($path, 0, -1);
+
+		public function __destruct() {
 		}
-		return is_dir($this->datadir.$path);
-	}
-	public function is_file($path) {
-		return is_file($this->datadir.$path);
-	}
-	public function stat($path) {
-		$fullPath = $this->datadir . $path;
-		$statResult = stat($fullPath);
 
-		if ($statResult['size'] < 0) {
-			$size = self::getFileSizeFromOS($fullPath);
-			$statResult['size'] = $size;
-			$statResult[7] = $size;
+		public function getId() {
+			return 'local::' . $this->datadir;
 		}
-		return $statResult;
-	}
-	public function filetype($path) {
-		$filetype=filetype($this->datadir.$path);
-		if($filetype=='link') {
-			$filetype=filetype(realpath($this->datadir.$path));
+
+		public function mkdir($path) {
+			return @mkdir($this->datadir . $path);
 		}
-		return $filetype;
-	}
-	public function filesize($path) {
-		if($this->is_dir($path)) {
-			return 0;
-		}else{
-			$fullPath = $this->datadir . $path;
-			$fileSize = filesize($fullPath);
-			if ($fileSize < 0) {
-				return self::getFileSizeFromOS($fullPath);
+
+		public function rmdir($path) {
+			return @rmdir($this->datadir . $path);
+		}
+
+		public function opendir($path) {
+			return opendir($this->datadir . $path);
+		}
+
+		public function is_dir($path) {
+			if (substr($path, -1) == '/') {
+				$path = substr($path, 0, -1);
 			}
+			return is_dir($this->datadir . $path);
+		}
 
-			return $fileSize;
+		public function is_file($path) {
+			return is_file($this->datadir . $path);
 		}
-	}
-	public function isReadable($path) {
-		return is_readable($this->datadir.$path);
-	}
-	public function isUpdatable($path) {
-		return is_writable($this->datadir.$path);
-	}
-	public function file_exists($path) {
-		return file_exists($this->datadir.$path);
-	}
-	public function filemtime($path) {
-		return filemtime($this->datadir.$path);
-	}
-	public function touch($path, $mtime=null) {
-		// sets the modification time of the file to the given value.
-		// If mtime is nil the current time is set.
-		// note that the access time of the file always changes to the current time.
-		if($this->file_exists($path) and !$this->isUpdatable($path)) {
-			return false;
+
+		public function stat($path) {
+			$fullPath = $this->datadir . $path;
+			$statResult = stat($fullPath);
+
+			if ($statResult['size'] < 0) {
+				$size = self::getFileSizeFromOS($fullPath);
+				$statResult['size'] = $size;
+				$statResult[7] = $size;
+			}
+			return $statResult;
 		}
-		if(!is_null($mtime)) {
-			$result=touch( $this->datadir.$path, $mtime );
-		}else{
-			$result=touch( $this->datadir.$path);
+
+		public function filetype($path) {
+			$filetype = filetype($this->datadir . $path);
+			if ($filetype == 'link') {
+				$filetype = filetype(realpath($this->datadir . $path));
+			}
+			return $filetype;
 		}
-		if( $result ) {
-			clearstatcache( true, $this->datadir.$path );
+
+		public function filesize($path) {
+			if ($this->is_dir($path)) {
+				return 0;
+			} else {
+				$fullPath = $this->datadir . $path;
+				$fileSize = filesize($fullPath);
+				if ($fileSize < 0) {
+					return self::getFileSizeFromOS($fullPath);
+				}
+
+				return $fileSize;
+			}
 		}
 
-		return $result;
-	}
-	public function file_get_contents($path) {
-		return file_get_contents($this->datadir.$path);
-	}
-	public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
-		return file_put_contents($this->datadir.$path, $data);
-	}
-	public function unlink($path) {
-		return $this->delTree($path);
-	}
-	public function rename($path1, $path2) {
-		if (!$this->isUpdatable($path1)) {
-			\OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, \OC_Log::ERROR);
-			return false;
+		public function isReadable($path) {
+			return is_readable($this->datadir . $path);
 		}
-		if(! $this->file_exists($path1)) {
-			\OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, \OC_Log::ERROR);
-			return false;
+
+		public function isUpdatable($path) {
+			return is_writable($this->datadir . $path);
 		}
 
-		if($return=rename($this->datadir.$path1, $this->datadir.$path2)) {
+		public function file_exists($path) {
+			return file_exists($this->datadir . $path);
 		}
-		return $return;
-	}
-	public function copy($path1, $path2) {
-		if($this->is_dir($path2)) {
-			if(!$this->file_exists($path2)) {
-				$this->mkdir($path2);
+
+		public function filemtime($path) {
+			return filemtime($this->datadir . $path);
+		}
+
+		public function touch($path, $mtime = null) {
+			// sets the modification time of the file to the given value.
+			// If mtime is nil the current time is set.
+			// note that the access time of the file always changes to the current time.
+			if ($this->file_exists($path) and !$this->isUpdatable($path)) {
+				return false;
 			}
-			$source=substr($path1, strrpos($path1, '/')+1);
-			$path2.=$source;
+			if (!is_null($mtime)) {
+				$result = touch($this->datadir . $path, $mtime);
+			} else {
+				$result = touch($this->datadir . $path);
+			}
+			if ($result) {
+				clearstatcache(true, $this->datadir . $path);
+			}
+
+			return $result;
 		}
-		return copy($this->datadir.$path1, $this->datadir.$path2);
-	}
-	public function fopen($path, $mode) {
-		if($return=fopen($this->datadir.$path, $mode)) {
-			switch($mode) {
-				case 'r':
-					break;
-				case 'r+':
-				case 'w+':
-				case 'x+':
-				case 'a+':
-					break;
-				case 'w':
-				case 'x':
-				case 'a':
-					break;
+
+		public function file_get_contents($path) {
+			return file_get_contents($this->datadir . $path);
+		}
+
+		public function file_put_contents($path, $data) { //trigger_error("$path = ".var_export($path, 1));
+			return file_put_contents($this->datadir . $path, $data);
+		}
+
+		public function unlink($path) {
+			return $this->delTree($path);
+		}
+
+		public function rename($path1, $path2) {
+			if (!$this->isUpdatable($path1)) {
+				\OC_Log::write('core', 'unable to rename, file is not writable : ' . $path1, \OC_Log::ERROR);
+				return false;
+			}
+			if (!$this->file_exists($path1)) {
+				\OC_Log::write('core', 'unable to rename, file does not exists : ' . $path1, \OC_Log::ERROR);
+				return false;
 			}
+
+			if ($return = rename($this->datadir . $path1, $this->datadir . $path2)) {
+			}
+			return $return;
 		}
-		return $return;
-	}
 
-	public function getMimeType($path) {
-		if($this->isReadable($path)) {
-			return \OC_Helper::getMimeType($this->datadir . $path);
-		}else{
-			return false;
+		public function copy($path1, $path2) {
+			if ($this->is_dir($path2)) {
+				if (!$this->file_exists($path2)) {
+					$this->mkdir($path2);
+				}
+				$source = substr($path1, strrpos($path1, '/') + 1);
+				$path2 .= $source;
+			}
+			return copy($this->datadir . $path1, $this->datadir . $path2);
 		}
-	}
 
-	private function delTree($dir) {
-		$dirRelative=$dir;
-		$dir=$this->datadir.$dir;
-		if (!file_exists($dir)) return true;
-		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
-		foreach (scandir($dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(is_file($dir.'/'.$item)) {
-				if(unlink($dir.'/'.$item)) {
+		public function fopen($path, $mode) {
+			if ($return = fopen($this->datadir . $path, $mode)) {
+				switch ($mode) {
+					case 'r':
+						break;
+					case 'r+':
+					case 'w+':
+					case 'x+':
+					case 'a+':
+						break;
+					case 'w':
+					case 'x':
+					case 'a':
+						break;
 				}
-			}elseif(is_dir($dir.'/'.$item)) {
-				if (!$this->delTree($dirRelative. "/" . $item)) {
-					return false;
-				};
 			}
+			return $return;
 		}
-		if($return=rmdir($dir)) {
+
+		public function getMimeType($path) {
+			if ($this->isReadable($path)) {
+				return \OC_Helper::getMimeType($this->datadir . $path);
+			} else {
+				return false;
+			}
 		}
-		return $return;
-	}
 
-	private static function getFileSizeFromOS($fullPath) {
-		$name = strtolower(php_uname('s'));
-		// Windows OS: we use COM to access the filesystem
-		if (strpos($name, 'win') !== false) {
-			if (class_exists('COM')) {
-				$fsobj = new \COM("Scripting.FileSystemObject");
-				$f = $fsobj->GetFile($fullPath);
-				return $f->Size;
+		private function delTree($dir) {
+			$dirRelative = $dir;
+			$dir = $this->datadir . $dir;
+			if (!file_exists($dir)) return true;
+			if (!is_dir($dir) || is_link($dir)) return unlink($dir);
+			foreach (scandir($dir) as $item) {
+				if ($item == '.' || $item == '..') continue;
+				if (is_file($dir . '/' . $item)) {
+					if (unlink($dir . '/' . $item)) {
+					}
+				} elseif (is_dir($dir . '/' . $item)) {
+					if (!$this->delTree($dirRelative . "/" . $item)) {
+						return false;
+					};
+				}
 			}
-		} else if (strpos($name, 'bsd') !== false) {
-			if (\OC_Helper::is_function_enabled('exec')) {
-				return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
+			if ($return = rmdir($dir)) {
 			}
-		} else if (strpos($name, 'linux') !== false) {
-			if (\OC_Helper::is_function_enabled('exec')) {
-				return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
+			return $return;
+		}
+
+		private static function getFileSizeFromOS($fullPath) {
+			$name = strtolower(php_uname('s'));
+			// Windows OS: we use COM to access the filesystem
+			if (strpos($name, 'win') !== false) {
+				if (class_exists('COM')) {
+					$fsobj = new \COM("Scripting.FileSystemObject");
+					$f = $fsobj->GetFile($fullPath);
+					return $f->Size;
+				}
+			} else if (strpos($name, 'bsd') !== false) {
+				if (\OC_Helper::is_function_enabled('exec')) {
+					return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
+				}
+			} else if (strpos($name, 'linux') !== false) {
+				if (\OC_Helper::is_function_enabled('exec')) {
+					return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
+				}
+			} else {
+				\OC_Log::write('core',
+					'Unable to determine file size of "' . $fullPath . '". Unknown OS: ' . $name,
+					\OC_Log::ERROR);
 			}
-		} else {
-			\OC_Log::write('core',
-				'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name,
-				\OC_Log::ERROR);
+
+			return 0;
 		}
 
-		return 0;
-	}
+		public function hash($path, $type, $raw = false) {
+			return hash_file($type, $this->datadir . $path, $raw);
+		}
 
-	public function hash($path, $type, $raw=false) {
-		return hash_file($type, $this->datadir.$path, $raw);
-	}
+		public function free_space($path) {
+			$space = @disk_free_space($this->datadir . $path);
+			if ($space === false) {
+				return \OC\Files\FREE_SPACE_UNKNOWN;
+			}
+			return $space;
+		}
 
-	public function free_space($path) {
-		$space = @disk_free_space($this->datadir.$path);
-		if($space === false){
-			return \OC\Files\FREE_SPACE_UNKNOWN;
+		public function search($query) {
+			return $this->searchInDir($query);
 		}
-		return $space;
-	}
 
-	public function search($query) {
-		return $this->searchInDir($query);
-	}
-	public function getLocalFile($path) {
-		return $this->datadir.$path;
-	}
-	public function getLocalFolder($path) {
-		return $this->datadir.$path;
-	}
+		public function getLocalFile($path) {
+			return $this->datadir . $path;
+		}
 
-	protected function searchInDir($query, $dir='') {
-		$files=array();
-		foreach (scandir($this->datadir.$dir) as $item) {
-			if ($item == '.' || $item == '..') continue;
-			if(strstr(strtolower($item), strtolower($query))!==false) {
-				$files[]=$dir.'/'.$item;
-			}
-			if(is_dir($this->datadir.$dir.'/'.$item)) {
-				$files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
+		public function getLocalFolder($path) {
+			return $this->datadir . $path;
+		}
+
+		protected function searchInDir($query, $dir = '') {
+			$files = array();
+			foreach (scandir($this->datadir . $dir) as $item) {
+				if ($item == '.' || $item == '..') continue;
+				if (strstr(strtolower($item), strtolower($query)) !== false) {
+					$files[] = $dir . '/' . $item;
+				}
+				if (is_dir($this->datadir . $dir . '/' . $item)) {
+					$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
+				}
 			}
+			return $files;
 		}
-		return $files;
-	}
 
-	/**
-	 * check if a file or folder has been updated since $time
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		return $this->filemtime($path)>$time;
+		/**
+		 * check if a file or folder has been updated since $time
+		 *
+		 * @param string $path
+		 * @param int $time
+		 * @return bool
+		 */
+		public function hasUpdated($path, $time) {
+			return $this->filemtime($path) > $time;
+		}
 	}
 }
-}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 1da82da2163402c09c1cf3848ab07a0dcb2557d0..c96caebf4af6307d22fc3ebb375f46e0792ae770 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -328,6 +328,11 @@ interface Storage {
 	 */
 	public function getWatcher($path = '');
 
+	/**
+	 * @return \OC\Files\Cache\Storage
+	 */
+	public function getStorageCache();
+
 	/**
 	 * get the ETag for a file or folder
 	 *
diff --git a/lib/files/view.php b/lib/files/view.php
index d2d1a99818bfd92931348f7b2471b1843aac3d22..e2fc8d965b892dfdc405f47e227757b8feaea00a 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -245,14 +245,17 @@ class View {
 		if (!is_null($mtime) and !is_numeric($mtime)) {
 			$mtime = strtotime($mtime);
 		}
-		
+
 		$hooks = array('touch');
-		
+
 		if (!$this->file_exists($path)) {
 			$hooks[] = 'write';
 		}
-		
-		return $this->basicOperation('touch', $path, $hooks, $mtime);
+		$result = $this->basicOperation('touch', $path, $hooks, $mtime);
+		if (!$result) { //if native touch fails, we emulate it by changing the mtime in the cache
+			$this->putFileInfo($path, array('mtime' => $mtime));
+		}
+		return true;
 	}
 
 	public function file_get_contents($path) {
@@ -263,11 +266,13 @@ class View {
 		if (is_resource($data)) { //not having to deal with streams in file_put_contents makes life easier
 			$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
 			if (\OC_FileProxy::runPreProxies('file_put_contents', $absolutePath, $data)
-				&& Filesystem::isValidPath($path)) {
+				and Filesystem::isValidPath($path)
+					and !Filesystem::isFileBlacklisted($path)
+			) {
 				$path = $this->getRelativePath($absolutePath);
 				$exists = $this->file_exists($path);
 				$run = true;
-				if ($this->fakeRoot == Filesystem::getRoot() && ! Cache\Scanner::isIgnoredFile($path) ) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
 					if (!$exists) {
 						\OC_Hook::emit(
 							Filesystem::CLASSNAME,
@@ -295,7 +300,7 @@ class View {
 					list ($count, $result) = \OC_Helper::streamCopy($data, $target);
 					fclose($target);
 					fclose($data);
-					if ($this->fakeRoot == Filesystem::getRoot() && ! Cache\Scanner::isIgnoredFile($path) && $result !== false) {
+					if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) {
 						if (!$exists) {
 							\OC_Hook::emit(
 								Filesystem::CLASSNAME,
@@ -335,8 +340,12 @@ class View {
 		$postFix2 = (substr($path2, -1, 1) === '/') ? '/' : '';
 		$absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
 		$absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($path2));
-		if (\OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2)
-			and Filesystem::isValidPath($path2)) {
+		if (
+			\OC_FileProxy::runPreProxies('rename', $absolutePath1, $absolutePath2)
+			and Filesystem::isValidPath($path2)
+			and Filesystem::isValidPath($path1)
+			and !Filesystem::isFileBlacklisted($path2)
+		) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
 
@@ -344,7 +353,7 @@ class View {
 				return false;
 			}
 			$run = true;
-			if ($this->fakeRoot == Filesystem::getRoot()) {
+			if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
 				\OC_Hook::emit(
 					Filesystem::CLASSNAME, Filesystem::signal_rename,
 					array(
@@ -362,19 +371,28 @@ class View {
 					list(, $internalPath2) = Filesystem::resolvePath($absolutePath2 . $postFix2);
 					if ($storage) {
 						$result = $storage->rename($internalPath1, $internalPath2);
+						\OC_FileProxy::runPostProxies('rename', $absolutePath1, $absolutePath2);
 					} else {
 						$result = false;
 					}
 				} else {
-					$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);
-					if ($result !== false) {
-						$storage1->unlink($internalPath1);
+					if ($this->is_dir($path1)) {
+						$result = $this->copy($path1, $path2);
+						if ($result === true) {
+							list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+							$result = $storage1->deleteAll($internalPath1);
+						}
+					} else {
+						$source = $this->fopen($path1 . $postFix1, 'r');
+						$target = $this->fopen($path2 . $postFix2, 'w');
+						list($count, $result) = \OC_Helper::streamCopy($source, $target);
+						if ($result !== false) {
+							list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+							$storage1->unlink($internalPath1);
+						}
 					}
 				}
-				if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1) && $result !== false) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_rename,
@@ -398,7 +416,12 @@ class View {
 		$postFix2 = (substr($path2, -1, 1) === '/') ? '/' : '';
 		$absolutePath1 = Filesystem::normalizePath($this->getAbsolutePath($path1));
 		$absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($path2));
-		if (\OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2) and Filesystem::isValidPath($path2)) {
+		if (
+			\OC_FileProxy::runPreProxies('copy', $absolutePath1, $absolutePath2)
+			and Filesystem::isValidPath($path2)
+			and Filesystem::isValidPath($path1)
+			and !Filesystem::isFileBlacklisted($path2)
+		) {
 			$path1 = $this->getRelativePath($absolutePath1);
 			$path2 = $this->getRelativePath($absolutePath2);
 
@@ -450,9 +473,18 @@ class View {
 						$result = false;
 					}
 				} else {
-					$source = $this->fopen($path1 . $postFix1, 'r');
-					$target = $this->fopen($path2 . $postFix2, 'w');
-					list($count, $result) = \OC_Helper::streamCopy($source, $target);
+					if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
+						$result = $this->mkdir($path2);
+						while ($file = readdir($dh)) {
+							if (!Filesystem::isIgnoredDir($file)) {
+								$result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
+							}
+						}
+					} else {
+						$source = $this->fopen($path1 . $postFix1, 'r');
+						$target = $this->fopen($path2 . $postFix2, 'w');
+						list($count, $result) = \OC_Helper::streamCopy($source, $target);
+					}
 				}
 				if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
 					\OC_Hook::emit(
@@ -600,7 +632,10 @@ class View {
 	private function basicOperation($operation, $path, $hooks = array(), $extraParam = null) {
 		$postFix = (substr($path, -1, 1) === '/') ? '/' : '';
 		$absolutePath = Filesystem::normalizePath($this->getAbsolutePath($path));
-		if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam) and Filesystem::isValidPath($path)) {
+		if (\OC_FileProxy::runPreProxies($operation, $absolutePath, $extraParam)
+			and Filesystem::isValidPath($path)
+				and !Filesystem::isFileBlacklisted($path)
+		) {
 			$path = $this->getRelativePath($absolutePath);
 			if ($path == null) {
 				return false;
@@ -629,7 +664,7 @@ class View {
 	private function runHooks($hooks, $path, $post = false) {
 		$prefix = ($post) ? 'post_' : '';
 		$run = true;
-		if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && ! Cache\Scanner::isIgnoredFile($path) ) {
+		if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot()) {
 			foreach ($hooks as $hook) {
 				if ($hook != 'read') {
 					\OC_Hook::emit(
@@ -726,6 +761,9 @@ class View {
 				$data['permissions'] = $permissions;
 			}
 		}
+
+		$data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);
+
 		return $data;
 	}
 
@@ -761,18 +799,18 @@ class View {
 			}
 
 			$files = $cache->getFolderContents($internalPath); //TODO: mimetype_filter
+			$permissions = $permissionsCache->getDirectoryPermissions($cache->getId($internalPath), $user);
 
 			$ids = array();
 			foreach ($files as $i => $file) {
 				$files[$i]['type'] = $file['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
 				$ids[] = $file['fileid'];
 
-				$permissions = $permissionsCache->get($file['fileid'], $user);
-				if ($permissions === -1) {
-					$permissions = $storage->getPermissions($file['path']);
-					$permissionsCache->set($file['fileid'], $user, $permissions);
+				if (!isset($permissions[$file['fileid']])) {
+					$permissions[$file['fileid']] = $storage->getPermissions($file['path']);
+					$permissionsCache->set($file['fileid'], $user, $permissions[$file['fileid']]);
 				}
-				$files[$i]['permissions'] = $permissions;
+				$files[$i]['permissions'] = $permissions[$file['fileid']];
 			}
 
 			//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
@@ -933,11 +971,11 @@ class View {
 	}
 
 	/**
-	* Get the owner for a file or folder
-	*
-	* @param string $path
-	* @return string
-	*/
+	 * Get the owner for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
 	public function getOwner($path) {
 		return $this->basicOperation('getOwner', $path);
 	}
@@ -971,7 +1009,7 @@ class View {
 	 */
 	public function getPath($id) {
 		list($storage, $internalPath) = Cache\Cache::getById($id);
-		$mounts = Mount::findByStorageId($storage);
+		$mounts = Filesystem::getMountByStorageId($storage);
 		foreach ($mounts as $mount) {
 			/**
 			 * @var \OC\Files\Mount $mount
diff --git a/lib/helper.php b/lib/helper.php
index 73484ad913f2ba4addfce838a99cac0da1449eb6..225e9fd2a9a439e7903d1e6bbc8ddf0c08206078 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -27,6 +27,7 @@
 class OC_Helper {
 	private static $mimetypes=array();
 	private static $tmpFiles=array();
+	private static $mimetypeIcons = array();
 
 	/**
 	 * @brief Creates an url using a defined route
@@ -159,7 +160,7 @@ class OC_Helper {
 	 */
 	public static function imagePath( $app, $image ) {
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( "theme" );
+		$theme = OC_Util::getTheme();
 
 		// Check if the app is in the app folder
 		if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )) {
@@ -187,31 +188,38 @@ class OC_Helper {
 	 *
 	 * Returns the path to the image of this file type.
 	 */
-	public static function mimetypeIcon( $mimetype ) {
-		$alias=array('application/xml'=>'code/xml');
-		if(isset($alias[$mimetype])) {
-			$mimetype=$alias[$mimetype];
+	public static function mimetypeIcon($mimetype) {
+		$alias = array('application/xml' => 'code/xml');
+		if (isset($alias[$mimetype])) {
+			$mimetype = $alias[$mimetype];
+		}
+		if (isset(self::$mimetypeIcons[$mimetype])) {
+			return self::$mimetypeIcons[$mimetype];
 		}
 		// Replace slash and backslash with a minus
-		$mimetype = str_replace( "/", "-", $mimetype );
-		$mimetype = str_replace( "\\", "-", $mimetype );
+		$icon = str_replace('/', '-', $mimetype);
+		$icon = str_replace( '\\', '-', $icon);
 
 		// Is it a dir?
-		if( $mimetype == "dir" ) {
-			return OC::$WEBROOT."/core/img/filetypes/folder.png";
+		if ($mimetype === 'dir') {
+			self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/folder.png';
+			return OC::$WEBROOT.'/core/img/filetypes/folder.png';
 		}
 
 		// Icon exists?
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
-			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
-		}
-		//try only the first part of the filetype
-		$mimetype=substr($mimetype, 0, strpos($mimetype, '-'));
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
-			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
+		if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$icon.'.png')) {
+			self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png';
+			return OC::$WEBROOT.'/core/img/filetypes/'.$icon.'.png';
 		}
-		else{
-			return OC::$WEBROOT."/core/img/filetypes/file.png";
+
+		// Try only the first part of the filetype
+		$mimePart = substr($icon, 0, strpos($icon, '-'));
+		if (file_exists(OC::$SERVERROOT.'/core/img/filetypes/'.$mimePart.'.png')) {
+			self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png';
+			return OC::$WEBROOT.'/core/img/filetypes/'.$mimePart.'.png';
+		} else {
+			self::$mimetypeIcons[$mimetype] = OC::$WEBROOT.'/core/img/filetypes/file.png';
+			return OC::$WEBROOT.'/core/img/filetypes/file.png';
 		}
 	}
 
@@ -541,13 +549,15 @@ class OC_Helper {
 	}
 
 	/**
-	 * create a temporary file with an unique filename. It will not be deleted
-	 * automatically
-	 * @param string $postfix
-	 * @return string
+	 * move a file to oc-noclean temp dir
+	 * @param string $filename
+	 * @return mixed
 	 *
 	 */
-	public static function tmpFileNoClean($postfix='') {
+	public static function moveToNoClean($filename='') {
+		if ($filename == '') {
+			return false;
+		}
 		$tmpDirNoClean=get_temp_dir().'/oc-noclean/';
 		if (!file_exists($tmpDirNoClean) || !is_dir($tmpDirNoClean)) {
 			if (file_exists($tmpDirNoClean)) {
@@ -555,10 +565,12 @@ class OC_Helper {
 			}
 			mkdir($tmpDirNoClean);
 		}
-		$file=$tmpDirNoClean.md5(time().rand()).$postfix;
-		$fh=fopen($file, 'w');
-		fclose($fh);
-		return $file;
+		$newname=$tmpDirNoClean.basename($filename);
+		if (rename($filename, $newname)) {
+			return $newname;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -597,7 +609,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * remove all files created by self::tmpFileNoClean
+	 * remove all files in PHP /oc-noclean temp dir 
 	 */
 	public static function cleanTmpNoClean() {
 		$tmpDirNoCleanFile=get_temp_dir().'/oc-noclean/';
diff --git a/lib/hooks/basicemitter.php b/lib/hooks/basicemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..e615a58cfe846c3fde3d4aaf1d6ffdaf2b8a65c9
--- /dev/null
+++ b/lib/hooks/basicemitter.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+abstract class BasicEmitter implements Emitter {
+
+	/**
+	 * @var (callable[])[] $listeners
+	 */
+	private $listeners = array();
+
+	/**
+	 * @param string $scope
+	 * @param string $method
+	 * @param callable $callback
+	 */
+	public function listen($scope, $method, $callback) {
+		$eventName = $scope . '::' . $method;
+		if (!isset($this->listeners[$eventName])) {
+			$this->listeners[$eventName] = array();
+		}
+		if (array_search($callback, $this->listeners[$eventName]) === false) {
+			$this->listeners[$eventName][] = $callback;
+		}
+	}
+
+	/**
+	 * @param string $scope optional
+	 * @param string $method optional
+	 * @param callable $callback optional
+	 */
+	public function removeListener($scope = null, $method = null, $callback = null) {
+		$names = array();
+		$allNames = array_keys($this->listeners);
+		if ($scope and $method) {
+			$name = $scope . '::' . $method;
+			if (isset($this->listeners[$name])) {
+				$names[] = $name;
+			}
+		} elseif ($scope) {
+			foreach ($allNames as $name) {
+				$parts = explode('::', $name, 2);
+				if ($parts[0] == $scope) {
+					$names[] = $name;
+				}
+			}
+		} elseif ($method) {
+			foreach ($allNames as $name) {
+				$parts = explode('::', $name, 2);
+				if ($parts[1] == $method) {
+					$names[] = $name;
+				}
+			}
+		} else {
+			$names = $allNames;
+		}
+
+		foreach ($names as $name) {
+			if ($callback) {
+				$index = array_search($callback, $this->listeners[$name]);
+				if ($index !== false) {
+					unset($this->listeners[$name][$index]);
+				}
+			} else {
+				$this->listeners[$name] = array();
+			}
+		}
+	}
+
+	/**
+	 * @param string $scope
+	 * @param string $method
+	 * @param array $arguments optional
+	 */
+	protected function emit($scope, $method, $arguments = array()) {
+		$eventName = $scope . '::' . $method;
+		if (isset($this->listeners[$eventName])) {
+			foreach ($this->listeners[$eventName] as $callback) {
+				call_user_func_array($callback, $arguments);
+			}
+		}
+	}
+}
diff --git a/lib/hooks/emitter.php b/lib/hooks/emitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e9074bad67f9869070148c37832b7bab877a7c3
--- /dev/null
+++ b/lib/hooks/emitter.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+/**
+ * Class Emitter
+ *
+ * interface for all classes that are able to emit events
+ *
+ * @package OC\Hooks
+ */
+interface Emitter {
+	/**
+	 * @param string $scope
+	 * @param string $method
+	 * @param callable $callback
+	 */
+	public function listen($scope, $method, $callback);
+
+	/**
+	 * @param string $scope optional
+	 * @param string $method optional
+	 * @param callable $callback optional
+	 */
+	public function removeListener($scope = null, $method = null, $callback = null);
+}
diff --git a/lib/hooks/legacyemitter.php b/lib/hooks/legacyemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a2d16ace9a7ef8be7f2d8740e2a2b4437558802f
--- /dev/null
+++ b/lib/hooks/legacyemitter.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+abstract class LegacyEmitter extends BasicEmitter {
+	protected function emit($scope, $method, $arguments = array()) {
+		\OC_Hook::emit($scope, $method, $arguments);
+		parent::emit($scope, $method, $arguments);
+	}
+}
diff --git a/lib/hooks/publicemitter.php b/lib/hooks/publicemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..e2371713ac3fca9b8e4a265fd31ae3fe3d13cc56
--- /dev/null
+++ b/lib/hooks/publicemitter.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Hooks;
+
+class PublicEmitter extends BasicEmitter {
+	/**
+	 * @param string $scope
+	 * @param string $method
+	 * @param array $arguments optional
+	 */
+	public function emit($scope, $method, $arguments = array()) {
+		parent::emit($scope, $method, $arguments);
+	}
+}
diff --git a/lib/json.php b/lib/json.php
index f929e958957e99a6a1cc8cd8b919850a7f583c08..6ba0b13806b19fe78f45565290116f9de68212b0 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -14,7 +14,7 @@ class OC_JSON{
 	public static function setContentTypeHeader($type='application/json') {
 		if (!self::$send_content_type_header) {
 			// We send json data
-			header( 'Content-Type: '.$type );
+			header( 'Content-Type: '.$type . '; charset=utf-8');
 			self::$send_content_type_header = true;
 		}
 	}
diff --git a/lib/l10n.php b/lib/l10n.php
index 1e07a9b9557c1063dbeb229c450998ee3869c419..d35ce5fed14f4b19b3007f9e8b71c919b6ef4780 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -122,9 +122,21 @@ class OC_L10N{
 				)
 				&& file_exists($i18ndir.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
-				include strip_tags($i18ndir).strip_tags($lang).'.php';
+				$transFile = strip_tags($i18ndir).strip_tags($lang).'.php';
+				include $transFile;
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
 					$this->translations = $TRANSLATIONS;
+					//merge with translations from theme
+					$theme = OC_Config::getValue( "theme" );
+					if (!is_null($theme)) {
+						$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
+						if (file_exists($transFile)) {
+							include $transFile;
+							if (isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
+								$this->translations = array_merge($this->translations, $TRANSLATIONS);
+							}
+						}
+					}
 				}
 			}
 
@@ -298,10 +310,16 @@ class OC_L10N{
 				$temp = explode(';', $i);
 				$temp[0] = str_replace('-', '_', $temp[0]);
 				if( ($key = array_search($temp[0], $available)) !== false) {
+					if (is_null($app)) {
+						self::$language = $available[$key];
+					}
 					return $available[$key];
 				}
 				foreach($available as $l) {
 					if ( $temp[0] == substr($l, 0, 2) ) {
+						if (is_null($app)) {
+							self::$language = $l;
+						}
 						return $l;
 					}
 				}
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 8b7324f3ff446c7068d4cb774fe57a4c669b3f19..22c934e238d8c3f0b9448d5d53e2a0c10f80b32c 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "المساعدة",
 "Personal" => "شخصي",
-"Settings" => "تعديلات",
+"Settings" => "إعدادات",
 "Users" => "المستخدمين",
 "Apps" => "التطبيقات",
 "Admin" => "المدير",
@@ -18,14 +18,12 @@
 "Images" => "صور",
 "Set an admin username." => "اعداد اسم مستخدم للمدير",
 "Set an admin password." => "اعداد كلمة مرور للمدير",
-"Specify a data folder." => "تحديد مجلد ",
 "%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 username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
 "MySQL username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح",
 "DB Error: \"%s\"" => "خطأ في قواعد البيانات : \"%s\"",
 "Offending command was: \"%s\"" => "الأمر المخالف كان : \"%s\"",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "احذف اسم المستخدم هذا من الـ MySQL",
 "MySQL user '%s'@'%%' already exists" => "أسم المستخدم  '%s'@'%%' الخاص بـ MySQL موجود مسبقا",
 "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." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
@@ -49,8 +48,5 @@
 "%d months ago" => "%d شهر مضت",
 "last year" => "السنةالماضية",
 "years ago" => "سنة مضت",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s متاح . احصل على <a href=\"%s\">المزيد من المعلومات </a>",
-"up to date" => "محدّث",
-"updates check is disabled" => "فحص التحديثات معطّل",
 "Could not find category \"%s\"" => "تعذر العثور على المجلد \"%s\""
 );
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index d32e2aadfc5361de44cd1320856290b1cd243f28..2de4c0a6e68cb8fd930a0b10abaf8979ca745cf5 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -18,19 +18,18 @@
 "Images" => "Снимки",
 "Set an admin username." => "Въведете потребителско име за администратор.",
 "Set an admin password." => "Въведете парола за администратор.",
-"Specify a data folder." => "Укажете папка за данни",
 "%s enter the database username." => "%s въведете потребителско име за базата с данни.",
 "%s enter the database name." => "%s въведете име на базата с данни.",
 "%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни",
 "PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола",
 "You need to enter either an existing account or the administrator." => "Необходимо е да влезете в всъществуващ акаунт или като администратора",
-"Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
 "MySQL username and/or password not valid" => "Невалидно MySQL потребителско име и/или парола",
 "DB Error: \"%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 потребителско име и/или парола",
 "MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
 "Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
 "seconds ago" => "преди секунди",
@@ -45,8 +44,5 @@
 "%d months ago" => "преди %d месеца",
 "last year" => "последната година",
 "years ago" => "последните години",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s е налична. Получете <a href=\"%s\">повече информация</a>",
-"up to date" => "е актуална",
-"updates check is disabled" => "проверката за обновления е изключена",
 "Could not find category \"%s\"" => "Невъзможно откриване на категорията \"%s\""
 );
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
index cb6ff4455a996f24a5314297721f0c845a7a9a80..f7c8f57466d89082161d8215b799d5434b3a5b3e 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/l10n/bn_BD.php
@@ -2,9 +2,9 @@
 "Help" => "সহায়িকা",
 "Personal" => "ব্যক্তিগত",
 "Settings" => "নিয়ামকসমূহ",
-"Users" => "ব্যভহারকারী",
+"Users" => "ব্যবহারকারী",
 "Apps" => "অ্যাপ",
-"Admin" => "প্রশাসক",
+"Admin" => "প্রশাসন",
 "ZIP download is turned off." => "ZIP ডাউনলোড বন্ধ করা আছে।",
 "Files need to be downloaded one by one." => "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।",
 "Back to Files" => "ফাইলে ফিরে চল",
@@ -13,6 +13,7 @@
 "Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Token expired. Please reload page." => "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
 "Files" => "ফাইল",
+"Text" => "টেক্সট",
 "seconds ago" => "সেকেন্ড পূর্বে",
 "1 minute ago" => "১ মিনিট পূর্বে",
 "%d minutes ago" => "%d মিনিট পূর্বে",
@@ -22,8 +23,5 @@
 "%d days ago" => "%d  দিন পূর্বে",
 "last month" => "গত মাস",
 "last year" => "গত বছর",
-"years ago" => "বছর পূর্বে",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s এখন সুলভ।  <a href=\"%s\">আরও জানুন</a>",
-"up to date" => "সর্বশেষ",
-"updates check is disabled" => "পরিবর্ধন পরীক্ষণ করা বন্ধ রাখা হয়েছে"
+"years ago" => "বছর পূর্বে"
 );
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 108bb5c09be8d33e807f89b2f5b936c43c140d5d..5c368a85b28f7e5d068bb9619947073d1cda1daf 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -18,14 +18,13 @@
 "Images" => "Imatges",
 "Set an admin username." => "Establiu un nom d'usuari per l'administrador.",
 "Set an admin password." => "Establiu una contrasenya per l'administrador.",
-"Specify a data folder." => "Especifiqueu una carpeta de dades.",
 "%s enter the database username." => "%s escriviu el nom d'usuari de la base de dades.",
 "%s enter the database name." => "%s escriviu el nom de la base de dades.",
 "%s you may not use dots in the database name" => "%s no podeu usar punts en el nom de la base de dades",
 "%s set the database host." => "%s establiu l'ordinador central de la base de dades.",
 "PostgreSQL username and/or password not valid" => "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
 "You need to enter either an existing account or the administrator." => "Heu d'escriure un compte existent o el d'administrador.",
-"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
+"Oracle connection could not be established" => "No s'ha pogut establir la connexió Oracle",
 "MySQL username and/or password not valid" => "Nom d'usuari i/o contrasenya MySQL no vàlids",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "L'ordre en conflicte és: \"%s\"",
@@ -33,6 +32,7 @@
 "Drop this user from MySQL" => "Elimina aquest usuari de MySQL",
 "MySQL user '%s'@'%%' already exists" => "L'usuari MySQL '%s'@'%%' ja existeix",
 "Drop this user from MySQL." => "Elimina aquest usuari de MySQL.",
+"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
 "Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
 "MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
@@ -48,9 +48,6 @@
 "last month" => "el mes passat",
 "%d months ago" => "fa %d mesos",
 "last year" => "l'any passat",
-"years ago" => "fa anys",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s està disponible. Obtén <a href=\"%s\">més informació</a>",
-"up to date" => "actualitzat",
-"updates check is disabled" => "la comprovació d'actualitzacions està desactivada",
+"years ago" => "anys enrere",
 "Could not find category \"%s\"" => "No s'ha trobat la categoria \"%s\""
 );
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index d9ec3d82cf74c1b2ff358f0b44d2161649ef147c..36469507d405bde117e513f5023a40d65ab4c81e 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -18,14 +18,12 @@
 "Images" => "Obrázky",
 "Set an admin username." => "Zadejte uživatelské jméno správce.",
 "Set an admin password." => "Zadejte heslo správce.",
-"Specify a data folder." => "Určete složku dat.",
 "%s enter the database username." => "Zadejte uživatelské jméno %s databáze.",
 "%s enter the database name." => "Zadejte název databáze pro %s databáze.",
 "%s you may not use dots in the database name" => "V názvu databáze %s nesmíte používat tečky.",
 "%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 username and/or password not valid" => "Uživatelské jméno, či heslo Oracle není platné",
 "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\"",
@@ -33,12 +31,13 @@
 "Drop this user from MySQL" => "Zahodit uživatele z MySQL",
 "MySQL user '%s'@'%%' already exists" => "Uživatel '%s'@'%%' již v MySQL existuje",
 "Drop this user from MySQL." => "Zahodit uživatele z MySQL.",
+"Oracle username and/or password not valid" => "Uživatelské jméno, či heslo Oracle není platné",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s",
 "MS SQL username and/or password not valid: %s" => "Uživatelské jméno, či heslo MSSQL není platné: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité.",
 "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
-"seconds ago" => "před vteřinami",
-"1 minute ago" => "před 1 minutou",
+"seconds ago" => "před pár vteřinami",
+"1 minute ago" => "před minutou",
 "%d minutes ago" => "před %d minutami",
 "1 hour ago" => "před hodinou",
 "%d hours ago" => "před %d hodinami",
@@ -47,10 +46,7 @@
 "%d days ago" => "před %d dny",
 "last month" => "minulý měsíc",
 "%d months ago" => "Před %d měsíci",
-"last year" => "loni",
+"last year" => "minulý rok",
 "years ago" => "před lety",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s je dostupná. Získat <a href=\"%s\">více informací</a>",
-"up to date" => "aktuální",
-"updates check is disabled" => "kontrola aktualizací je vypnuta",
 "Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\""
 );
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3503dcc5727a9b1498c94da30a6a5198b5fef1c
--- /dev/null
+++ b/lib/l10n/cy_GB.php
@@ -0,0 +1,52 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Cymorth",
+"Personal" => "Personol",
+"Settings" => "Gosodiadau",
+"Users" => "Defnyddwyr",
+"Apps" => "Pecynnau",
+"Admin" => "Gweinyddu",
+"ZIP download is turned off." => "Mae llwytho ZIP wedi ei ddiffodd.",
+"Files need to be downloaded one by one." => "Mae angen llwytho ffeiliau i lawr fesul un.",
+"Back to Files" => "Nôl i Ffeiliau",
+"Selected files too large to generate zip file." => "Mae'r ffeiliau ddewiswyd yn rhy fawr i gynhyrchu ffeil zip.",
+"couldn't be determined" => "methwyd pennu",
+"Application is not enabled" => "Nid yw'r pecyn wedi'i alluogi",
+"Authentication error" => "Gwall dilysu",
+"Token expired. Please reload page." => "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
+"Files" => "Ffeiliau",
+"Text" => "Testun",
+"Images" => "Delweddau",
+"Set an admin username." => "Creu enw defnyddiwr i'r gweinyddwr.",
+"Set an admin password." => "Gosod cyfrinair y gweinyddwr.",
+"%s enter the database username." => "%s rhowch enw defnyddiwr y gronfa ddata.",
+"%s enter the database name." => "%s rhowch enw'r gronfa ddata.",
+"%s you may not use dots in the database name" => "%s does dim hawl defnyddio dot yn enw'r gronfa ddata",
+"%s set the database host." => "%s gosod gwesteiwr y gronfa ddata.",
+"PostgreSQL username and/or password not valid" => "Enw a/neu gyfrinair PostgreSQL annilys",
+"You need to enter either an existing account or the administrator." => "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
+"MySQL username and/or password not valid" => "Enw a/neu gyfrinair MySQL annilys",
+"DB Error: \"%s\"" => "Gwall DB: \"%s\"",
+"Offending command was: \"%s\"" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes.",
+"Drop this user from MySQL" => "Gollwng y defnyddiwr hwn o MySQL",
+"MySQL user '%s'@'%%' already exists" => "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli",
+"Drop this user from MySQL." => "Gollwng y defnyddiwr hwn o MySQL.",
+"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
+"Offending command was: \"%s\", name: %s, password: %s" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
+"MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
+"Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+"seconds ago" => "eiliad yn ôl",
+"1 minute ago" => "1 munud yn ôl",
+"%d minutes ago" => "%d munud yn ôl",
+"1 hour ago" => "1 awr yn ôl",
+"%d hours ago" => "%d awr yn ôl",
+"today" => "heddiw",
+"yesterday" => "ddoe",
+"%d days ago" => "%d diwrnod yn ôl",
+"last month" => "mis diwethaf",
+"%d months ago" => "%d mis yn ôl",
+"last year" => "y llynedd",
+"years ago" => "blwyddyn yn ôl",
+"Could not find category \"%s\"" => "Methu canfod categori \"%s\""
+);
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 38ccbbe8e2164513f8e94516a256013f8943cd40..aead17f510ef357c7d93b0d4f15db8c4685ff7b1 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Hjælp",
-"Personal" => "Personlig",
+"Personal" => "Personligt",
 "Settings" => "Indstillinger",
 "Users" => "Brugere",
 "Apps" => "Apps",
@@ -18,14 +18,12 @@
 "Images" => "Billeder",
 "Set an admin username." => "Angiv et admin brugernavn.",
 "Set an admin password." => "Angiv et admin kodeord.",
-"Specify a data folder." => "Specificer en data mappe.",
 "%s enter the database username." => "%s indtast database brugernavnet.",
 "%s enter the database name." => "%s indtast database navnet.",
 "%s you may not use dots in the database name" => "%s du må ikke bruge punktummer i databasenavnet.",
 "%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 username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
 "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\"",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "Slet denne bruger fra MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.",
 "Drop this user from MySQL." => "Slet denne bruger fra MySQL",
+"Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
@@ -42,15 +41,12 @@
 "%d minutes ago" => "%d minutter siden",
 "1 hour ago" => "1 time siden",
 "%d hours ago" => "%d timer siden",
-"today" => "I dag",
-"yesterday" => "I går",
+"today" => "i dag",
+"yesterday" => "i går",
 "%d days ago" => "%d dage siden",
-"last month" => "Sidste måned",
+"last month" => "sidste måned",
 "%d months ago" => "%d måneder siden",
-"last year" => "Sidste år",
+"last year" => "sidste år",
 "years ago" => "Ã¥r siden",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgængelig. Få <a href=\"%s\">mere information</a>",
-"up to date" => "opdateret",
-"updates check is disabled" => "Check for opdateringer er deaktiveret",
 "Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\""
 );
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 3c2069d46371f804c458362cb6c9b3f5995d0bf1..74715bc66eb7f34f0e206d77f3f46c695cace52c 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -4,28 +4,26 @@
 "Settings" => "Einstellungen",
 "Users" => "Benutzer",
 "Apps" => "Apps",
-"Admin" => "Administrator",
+"Admin" => "Administration",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
 "Selected files too large to generate zip file." => "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen.",
 "couldn't be determined" => "konnte nicht festgestellt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
-"Authentication error" => "Authentifizierungs-Fehler",
+"Authentication error" => "Fehler bei der Anmeldung",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
 "Files" => "Dateien",
 "Text" => "Text",
 "Images" => "Bilder",
 "Set an admin username." => "Setze Administrator Benutzername.",
 "Set an admin password." => "Setze Administrator Passwort",
-"Specify a data folder." => "Datei-Verzeichnis angeben.",
 "%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.",
 "%s enter the database name." => "%s gib den Datenbank-Namen an.",
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "%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 username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "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\"",
@@ -33,12 +31,13 @@
 "Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
 "Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Instalationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor einer Minute",
+"1 minute ago" => "vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
 "1 hour ago" => "Vor einer Stunde",
 "%d hours ago" => "Vor %d Stunden",
@@ -49,8 +48,5 @@
 "%d months ago" => "Vor %d Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>",
-"up to date" => "aktuell",
-"updates check is disabled" => "Die Update-Überprüfung ist ausgeschaltet",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
 );
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 9978cdf8b317b5820bb2e9ee78324d0f566117c0..5ebe4fb26fc35b9300b3b5d1a18bb8470d9296f7 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -18,14 +18,13 @@
 "Images" => "Bilder",
 "Set an admin username." => "Setze Administrator Benutzername.",
 "Set an admin password." => "Setze Administrator Passwort",
-"Specify a data folder." => "Datei-Verzeichnis angeben",
 "%s enter the database username." => "%s geben Sie den Datenbank-Benutzernamen an.",
 "%s enter the database name." => "%s geben Sie den Datenbank-Namen an.",
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "%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." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
+"Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut 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\"",
@@ -33,12 +32,13 @@
 "Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
 "Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "seconds ago" => "Gerade eben",
-"1 minute ago" => "Vor einer Minute",
+"1 minute ago" => "Vor 1 Minute",
 "%d minutes ago" => "Vor %d Minuten",
 "1 hour ago" => "Vor einer Stunde",
 "%d hours ago" => "Vor %d Stunden",
@@ -49,8 +49,5 @@
 "%d months ago" => "Vor %d Monaten",
 "last year" => "Letztes Jahr",
 "years ago" => "Vor  Jahren",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>",
-"up to date" => "aktuell",
-"updates check is disabled" => "Die Update-Überprüfung ist ausgeschaltet",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden."
 );
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index a3599095258d0e5c9f188efbe5f089158f719c6e..8637b8da269b30f88f86a702655fa16af21563e4 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -18,14 +18,12 @@
 "Images" => "Εικόνες",
 "Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
 "Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
-"Specify a data folder." => "Καθορίστε τον φάκελο δεδομένων.",
 "%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 username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
 "MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
 "DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
 "Offending command was: \"%s\"" => "Η εντολη παραβατικοτητας ηταν: \"%s\"",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL",
 "MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη",
 "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." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
@@ -43,14 +42,11 @@
 "1 hour ago" => "1 ώρα πριν",
 "%d hours ago" => "%d ώρες πριν",
 "today" => "σήμερα",
-"yesterday" => "χθές",
+"yesterday" => "χτες",
 "%d days ago" => "%d ημέρες πριν",
-"last month" => "τον προηγούμενο μήνα",
+"last month" => "τελευταίο μήνα",
 "%d months ago" => "%d μήνες πριν",
-"last year" => "τον προηγούμενο χρόνο",
+"last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s είναι διαθέσιμο. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>",
-"up to date" => "ενημερωμένο",
-"updates check is disabled" => "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος",
 "Could not find category \"%s\"" => "Αδυναμία εύρεσης κατηγορίας \"%s\""
 );
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index dac11ffe7e602711bf7e797da0afaa618a5a49bf..2782be65da9e7a3030139a7bf79d4f5a0e18edd5 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -15,7 +15,7 @@
 "Files" => "Dosieroj",
 "Text" => "Teksto",
 "Images" => "Bildoj",
-"seconds ago" => "sekundojn antaÅ­e",
+"seconds ago" => "sekundoj antaÅ­e",
 "1 minute ago" => "antaÅ­ 1 minuto",
 "%d minutes ago" => "antaÅ­ %d minutoj",
 "1 hour ago" => "antaÅ­ 1 horo",
@@ -23,12 +23,9 @@
 "today" => "hodiaÅ­",
 "yesterday" => "hieraÅ­",
 "%d days ago" => "antaÅ­ %d tagoj",
-"last month" => "lasta monato",
+"last month" => "lastamonate",
 "%d months ago" => "antaÅ­ %d monatoj",
-"last year" => "lasta jaro",
-"years ago" => "jarojn antaÅ­e",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>",
-"up to date" => "ĝisdata",
-"updates check is disabled" => "ĝisdateckontrolo estas malkapabligita",
+"last year" => "lastajare",
+"years ago" => "jaroj antaÅ­e",
 "Could not find category \"%s\"" => "Ne troviĝis kategorio “%s”"
 );
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 37b15a375c48beda29af741b775d307154a5ffce..3b32036d3af7e898ae22b26b580d2536ec2ade54 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -18,14 +18,13 @@
 "Images" => "Imágenes",
 "Set an admin username." => "Configurar un nombre de usuario del administrador",
 "Set an admin password." => "Configurar la contraseña del administrador.",
-"Specify a data folder." => "Especificar la carpeta de datos.",
 "%s enter the database username." => "%s ingresar el usuario de la base de datos.",
 "%s enter the database name." => "%s ingresar el nombre de la base de datos",
 "%s you may not use dots in the database name" => "%s no se puede utilizar puntos en el nombre de la base de datos",
 "%s set the database host." => "%s ingresar el host de la base de datos.",
 "PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
 "You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
+"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
 "MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
 "DB Error: \"%s\"" => "Error BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
@@ -33,6 +32,7 @@
 "Drop this user from MySQL" => "Eliminar este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
 "Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
+"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
 "MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
@@ -45,12 +45,9 @@
 "today" => "hoy",
 "yesterday" => "ayer",
 "%d days ago" => "hace %d días",
-"last month" => "este mes",
+"last month" => "mes pasado",
 "%d months ago" => "Hace %d meses",
-"last year" => "este año",
+"last year" => "año pasado",
 "years ago" => "hace años",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Obtén <a href=\"%s\">más información</a>",
-"up to date" => "actualizado",
-"updates check is disabled" => "comprobar actualizaciones está desactivado",
 "Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\""
 );
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index ff3d47285fc8e60013ee3648d1b752070fdee2ae..1df1b16de658907cba26c001d8df2ea88b54c4cc 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Ayuda",
 "Personal" => "Personal",
-"Settings" => "Ajustes",
+"Settings" => "Configuración",
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
@@ -11,21 +11,19 @@
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
 "couldn't be determined" => "no pudo ser determinado",
 "Application is not enabled" => "La aplicación no está habilitada",
-"Authentication error" => "Error de autenticación",
+"Authentication error" => "Error al autenticar",
 "Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
 "Files" => "Archivos",
 "Text" => "Texto",
 "Images" => "Imágenes",
 "Set an admin username." => "Configurar un nombre de administrador",
 "Set an admin password." => "Configurar una palabra clave de administrador",
-"Specify a data folder." => "Especificar un directorio de datos",
 "%s enter the database username." => "%s Entre el Usuario de la Base de Datos",
 "%s enter the database name." => "%s Entre el Nombre de la Base de Datos",
 "%s you may not use dots in the database name" => "%s no puede usar puntos en el nombre de la Base de Datos",
 "%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 username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
 "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\"",
@@ -33,11 +31,12 @@
 "Drop this user from MySQL" => "Borrar este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existente",
 "Drop this user from MySQL." => "Borrar este usuario de MySQL",
+"Oracle username and/or password not valid" => "El nombre de usuario y contraseña no son válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
 "MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
-"seconds ago" => "hace unos segundos",
+"seconds ago" => "segundos atrás",
 "1 minute ago" => "hace 1 minuto",
 "%d minutes ago" => "hace %d minutos",
 "1 hour ago" => "1 hora atrás",
@@ -45,12 +44,9 @@
 "today" => "hoy",
 "yesterday" => "ayer",
 "%d days ago" => "hace %d días",
-"last month" => "este mes",
+"last month" => "el mes pasado",
 "%d months ago" => "%d meses atrás",
-"last year" => "este año",
-"years ago" => "hace años",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Conseguí <a href=\"%s\">más información</a>",
-"up to date" => "actualizado",
-"updates check is disabled" => "comprobar actualizaciones está desactivado",
+"last year" => "el año pasado",
+"years ago" => "años atrás",
 "Could not find category \"%s\"" => "No fue posible encontrar la categoría \"%s\""
 );
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 6948686b7f68068d98a0b53ff9b24946ccf2ce96..24fc98bde6429bb63445760f67e82e1e850fc780 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -9,7 +9,7 @@
 "Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
 "Back to Files" => "Tagasi failide juurde",
 "Selected files too large to generate zip file." => "Valitud failid on ZIP-faili loomiseks liiga suured.",
-"couldn't be determined" => "Ei suuda tuvastada",
+"couldn't be determined" => "ei suudetud tuvastada",
 "Application is not enabled" => "Rakendus pole sisse lülitatud",
 "Authentication error" => "Autentimise viga",
 "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
@@ -18,14 +18,13 @@
 "Images" => "Pildid",
 "Set an admin username." => "Määra admin kasutajanimi.",
 "Set an admin password." => "Määra admini parool.",
-"Specify a data folder." => "Määra andmete kaust.",
-"%s enter the database username." => "%s sisesta andmebaasi kasutajatunnus",
+"%s enter the database username." => "%s sisesta andmebaasi kasutajatunnus.",
 "%s enter the database name." => "%s sisesta andmebaasi nimi.",
 "%s you may not use dots in the database name" => "%s punktide kasutamine andmebaasi nimes pole lubatud",
 "%s set the database host." => "%s määra andmebaasi server.",
 "PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
 "You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
-"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
+"Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
 "MySQL username and/or password not valid" => "MySQL kasutajatunnus ja/või parool pole õiged",
 "DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
 "Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
@@ -33,6 +32,7 @@
 "Drop this user from MySQL" => "Kustuta see kasutaja MySQL-ist",
 "MySQL user '%s'@'%%' already exists" => "MySQL kasutaja '%s'@'%%' on juba olemas",
 "Drop this user from MySQL." => "Kustuta see kasutaja MySQL-ist.",
+"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
 "Offending command was: \"%s\", name: %s, password: %s" => "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
@@ -45,12 +45,9 @@
 "today" => "täna",
 "yesterday" => "eile",
 "%d days ago" => "%d päeva tagasi",
-"last month" => "eelmisel kuul",
+"last month" => "viimasel kuul",
 "%d months ago" => "%d kuud tagasi",
-"last year" => "eelmisel aastal",
+"last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>",
-"up to date" => "ajakohane",
-"updates check is disabled" => "uuenduste kontrollimine on välja lülitatud",
 "Could not find category \"%s\"" => "Ei leia kategooriat \"%s\""
 );
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 36eb397e4256d052c711b45589373b796bf4df7a..05b68b062c5a6c8c0ec5d81b59e4a4932f1a37e1 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -11,21 +11,19 @@
 "Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
 "couldn't be determined" => "ezin izan da zehaztu",
 "Application is not enabled" => "Aplikazioa ez dago gaituta",
-"Authentication error" => "Autentikazio errorea",
+"Authentication error" => "Autentifikazio errorea",
 "Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
 "Files" => "Fitxategiak",
 "Text" => "Testua",
 "Images" => "Irudiak",
 "Set an admin username." => "Ezarri administraziorako erabiltzaile izena.",
 "Set an admin password." => "Ezarri administraziorako pasahitza.",
-"Specify a data folder." => "Zehaztu data karpeta.",
 "%s enter the database username." => "%s sartu datu basearen erabiltzaile izena.",
 "%s enter the database name." => "%s sartu datu basearen izena.",
 "%s you may not use dots in the database name" => "%s ezin duzu punturik erabili datu basearen izenean.",
 "%s set the database host." => "%s sartu datu basearen hostalaria.",
 "PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
 "You need to enter either an existing account or the administrator." => "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
-"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
 "MySQL username and/or password not valid" => "MySQL erabiltzaile edota pasahitza ez dira egokiak.",
 "DB Error: \"%s\"" => "DB errorea: \"%s\"",
 "Offending command was: \"%s\"" => "Errorea komando honek sortu du: \"%s\"",
@@ -33,11 +31,12 @@
 "Drop this user from MySQL" => "Ezabatu erabiltzaile hau MySQLtik",
 "MySQL user '%s'@'%%' already exists" => "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da",
 "Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
+"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
 "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
-"seconds ago" => "orain dela segundu batzuk",
+"seconds ago" => "segundu",
 "1 minute ago" => "orain dela minutu 1",
 "%d minutes ago" => "orain dela %d minutu",
 "1 hour ago" => "orain dela ordu bat",
@@ -45,12 +44,9 @@
 "today" => "gaur",
 "yesterday" => "atzo",
 "%d days ago" => "orain dela %d egun",
-"last month" => "joan den hilabetea",
+"last month" => "joan den hilabetean",
 "%d months ago" => "orain dela %d hilabete",
-"last year" => "joan den urtea",
-"years ago" => "orain dela urte batzuk",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s eskuragarri dago. Lortu <a href=\"%s\">informazio gehiago</a>",
-"up to date" => "eguneratuta",
-"updates check is disabled" => "eguneraketen egiaztapena ez dago gaituta",
+"last year" => "joan den urtean",
+"years ago" => "urte",
 "Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu"
 );
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index f05195f5b8b9bbd3c8be7d92460a32a75604a562..b0d423421df2ae20e890481f99e199a2ab80abf6 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -14,7 +14,6 @@
 "Files" => "پرونده‌ها",
 "Text" => "متن",
 "Images" => "تصاویر",
-"Specify a data folder." => "پوشه ای برای داده ها مشخص کنید.",
 "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" => "ثانیه‌ها پیش",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 2c85931e1d0b02f781850d084a17671a5c4db4ed..0caa7b12df6d5ffc4c9a3a9dc24b5807e8d0c9b2 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -11,25 +11,25 @@
 "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
 "couldn't be determined" => "ei voitu määrittää",
 "Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
-"Authentication error" => "Todennusvirhe",
+"Authentication error" => "Tunnistautumisvirhe",
 "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
 "Files" => "Tiedostot",
 "Text" => "Teksti",
 "Images" => "Kuvat",
 "Set an admin username." => "Aseta ylläpitäjän käyttäjätunnus.",
 "Set an admin password." => "Aseta ylläpitäjän salasana.",
-"Specify a data folder." => "Määritä datakansio.",
 "%s enter the database username." => "%s anna tietokannan käyttäjätunnus.",
 "%s enter the database name." => "%s anna tietokannan nimi.",
 "%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
 "PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
+"Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
 "MySQL username and/or password not valid" => "MySQL:n käyttäjätunnus ja/tai salasana on väärin",
 "DB Error: \"%s\"" => "Tietokantavirhe: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "MySQL-käyttäjä '%s'@'localhost' on jo olemassa.",
 "Drop this user from MySQL" => "Pudota tämä käyttäjä MySQL:stä",
 "MySQL user '%s'@'%%' already exists" => "MySQL-käyttäjä '%s'@'%%' on jo olemassa",
 "Drop this user from MySQL." => "Pudota tämä käyttäjä MySQL:stä.",
+"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
 "MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
 "Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
 "seconds ago" => "sekuntia sitten",
@@ -44,8 +44,5 @@
 "%d months ago" => "%d kuukautta sitten",
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saatavilla. Lue <a href=\"%s\">lisätietoja</a>",
-"up to date" => "ajan tasalla",
-"updates check is disabled" => "päivitysten tarkistus on pois käytöstä",
 "Could not find category \"%s\"" => "Luokkaa \"%s\" ei löytynyt"
 );
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 9448502df6a6a15488ebbd7846b410b9d5b387a5..aed5d056f370dc6af67db055595cc0a19cd16ce4 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -18,14 +18,13 @@
 "Images" => "Images",
 "Set an admin username." => "Spécifiez un nom d'utilisateur pour l'administrateur.",
 "Set an admin password." => "Spécifiez un mot de passe administrateur.",
-"Specify a data folder." => "Spécifiez un répertoire pour les données.",
 "%s enter the database username." => "%s entrez le nom d'utilisateur de la base de données.",
 "%s enter the database name." => "%s entrez le nom de la base de données.",
 "%s you may not use dots in the database name" => "%s vous nez pouvez pas utiliser de points dans le nom de la base de données",
 "%s set the database host." => "%s spécifiez l'hôte de la base de données.",
 "PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
 "You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
-"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
+"Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie",
 "MySQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide",
 "DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"",
 "Offending command was: \"%s\"" => "La requête en cause est : \"%s\"",
@@ -33,12 +32,13 @@
 "Drop this user from MySQL" => "Retirer cet utilisateur de la base MySQL",
 "MySQL user '%s'@'%%' already exists" => "L'utilisateur MySQL '%s'@'%%' existe déjà",
 "Drop this user from MySQL." => "Retirer cet utilisateur de la base MySQL.",
+"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
 "Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
 "MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
 "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-"seconds ago" => "à l'instant",
-"1 minute ago" => "il y a 1 minute",
+"seconds ago" => "il y a quelques secondes",
+"1 minute ago" => "il y a une minute",
 "%d minutes ago" => "il y a %d minutes",
 "1 hour ago" => "Il y a une heure",
 "%d hours ago" => "Il y a %d heures",
@@ -49,8 +49,5 @@
 "%d months ago" => "Il y a %d mois",
 "last year" => "l'année dernière",
 "years ago" => "il y a plusieurs années",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>",
-"up to date" => "À jour",
-"updates check is disabled" => "la vérification des mises à jour est désactivée",
 "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\""
 );
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index a11724fef43a084c097c009fe2fd6221b46e35e7..1b4db4b30af86b704d60b400c12c1a9cfd3ec15c 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Axuda",
 "Personal" => "Persoal",
-"Settings" => "Configuracións",
+"Settings" => "Axustes",
 "Users" => "Usuarios",
 "Apps" => "Aplicativos",
 "Admin" => "Administración",
@@ -11,21 +11,20 @@
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip.",
 "couldn't be determined" => "non foi posíbel determinalo",
 "Application is not enabled" => "O aplicativo non está activado",
-"Authentication error" => "Produciuse un erro na autenticación",
+"Authentication error" => "Produciuse un erro de autenticación",
 "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imaxes",
 "Set an admin username." => "Estabeleza un nome de usuario administrador",
 "Set an admin password." => "Estabeleza un contrasinal de administrador",
-"Specify a data folder." => "Especifique un cartafol de datos.",
 "%s enter the database username." => "%s introduza o nome de usuario da base de datos",
 "%s enter the database name." => "%s introduza o nome da base de datos",
 "%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos",
 "%s set the database host." => "%s estabeleza o servidor da base de datos",
 "PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
 "You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
-"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
+"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
 "MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
 "DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
 "Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
@@ -33,6 +32,7 @@
 "Drop this user from MySQL" => "Omitir este usuario de MySQL",
 "MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
 "Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
 "Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
 "MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "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.",
@@ -49,8 +49,5 @@
 "%d months ago" => "Vai %d meses",
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s está dispoñíbel. Obtéña <a href=\"%s\">máis información</a>",
-"up to date" => "actualizado",
-"updates check is disabled" => "a comprobación de actualizacións está desactivada",
 "Could not find category \"%s\"" => "Non foi posíbel atopar a categoría «%s»"
 );
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 078a731afc0defacdaafaf0c93b7890dad81c4ae..dcd0545adba77a9c5c1d9da3315475e97d4dbcc5 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -27,8 +27,5 @@
 "%d months ago" => "לפני %d חודשים",
 "last year" => "שנה שעברה",
 "years ago" => "שנים",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s זמין. קבלת <a href=\"%s\">מידע נוסף</a>",
-"up to date" => "עדכני",
-"updates check is disabled" => "בדיקת עדכונים מנוטרלת",
 "Could not find category \"%s\"" => "לא ניתן למצוא את הקטגוריה „%s“"
 );
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
index 8b0dd6de0a1347f5dade7baa00f7203262c5164c..3ce75c99f0e016c3a7a2b7e09e35bfde93994bdb 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -3,6 +3,7 @@
 "Personal" => "Osobno",
 "Settings" => "Postavke",
 "Users" => "Korisnici",
+"Apps" => "Aplikacije",
 "Admin" => "Administrator",
 "Authentication error" => "Greška kod autorizacije",
 "Files" => "Datoteke",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 537066c6feacab09a5954d33e68ce39f73f0f0ab..3b5c886bd2cb532b57224c5bb172cb3851a455cb 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -11,21 +11,20 @@
 "Selected files too large to generate zip file." => "A kiválasztott fájlok túl nagyok a zip tömörítéshez.",
 "couldn't be determined" => "nem határozható meg",
 "Application is not enabled" => "Az alkalmazás nincs engedélyezve",
-"Authentication error" => "Hitelesítési hiba",
+"Authentication error" => "Azonosítási hiba",
 "Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.",
 "Files" => "Fájlok",
 "Text" => "Szöveg",
 "Images" => "Képek",
 "Set an admin username." => "Állítson be egy felhasználói nevet az adminisztrációhoz.",
 "Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
-"Specify a data folder." => "Adja meg az adatokat tartalmazó könyvtár nevét.",
 "%s enter the database username." => "%s adja meg az adatbázist elérő felhasználó login nevét.",
 "%s enter the database name." => "%s adja meg az adatbázis nevét.",
 "%s you may not use dots in the database name" => "%s az adatbázis neve nem tartalmazhat pontot",
 "%s set the database host." => "%s adja meg az adatbázist szolgáltató számítógép nevét.",
 "PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
 "You need to enter either an existing account or the administrator." => "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
-"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
+"Oracle connection could not be established" => "Az Oracle kapcsolat nem hozható létre",
 "MySQL username and/or password not valid" => "A MySQL felhasználói név és/vagy jelszó érvénytelen",
 "DB Error: \"%s\"" => "Adatbázis hiba: \"%s\"",
 "Offending command was: \"%s\"" => "A hibát ez a parancs okozta: \"%s\"",
@@ -33,11 +32,12 @@
 "Drop this user from MySQL" => "Törölje ezt a felhasználót a MySQL-ből",
 "MySQL user '%s'@'%%' already exists" => "A '%s'@'%%' MySQL felhasználó már létezik",
 "Drop this user from MySQL." => "Törölje ezt a felhasználót a MySQL-ből.",
+"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
 "Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
 "MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %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>.",
-"seconds ago" => "másodperce",
+"seconds ago" => "pár másodperce",
 "1 minute ago" => "1 perce",
 "%d minutes ago" => "%d perce",
 "1 hour ago" => "1 órája",
@@ -48,9 +48,6 @@
 "last month" => "múlt hónapban",
 "%d months ago" => "%d hónapja",
 "last year" => "tavaly",
-"years ago" => "éve",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s elérhető. <a href=\"%s\">További információ</a>.",
-"up to date" => "a legfrissebb változat",
-"updates check is disabled" => "A frissitések ellenőrzése nincs engedélyezve.",
+"years ago" => "több éve",
 "Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\""
 );
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
index e790c41d072ae03b2f0d33575f40a2229561fb33..573281553fcc031065264c1999a3213a713597e2 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -3,6 +3,7 @@
 "Personal" => "Personal",
 "Settings" => "Configurationes",
 "Users" => "Usatores",
+"Apps" => "Applicationes",
 "Admin" => "Administration",
 "Files" => "Files",
 "Text" => "Texto"
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index b34fa0ac59d3ee1fd08d56b23031371608401aaf..29843a9532702c26ee0c83f51d6e7c6b38bd321d 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -18,14 +18,12 @@
 "Images" => "Gambar",
 "Set an admin username." => "Setel nama pengguna admin.",
 "Set an admin password." => "Setel sandi admin.",
-"Specify a data folder." => "Tentukan folder data.",
 "%s enter the database username." => "%s masukkan nama pengguna basis data.",
 "%s enter the database name." => "%s masukkan nama basis data.",
 "%s you may not use dots in the database name" => "%sAnda tidak boleh menggunakan karakter titik pada nama basis data",
 "%s set the database host." => "%s setel host basis data.",
 "PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
 "You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
-"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
 "MySQL username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL tidak valid",
 "DB Error: \"%s\"" => "Galat Basis Data: \"%s\"",
 "Offending command was: \"%s\"" => "Perintah yang bermasalah: \"%s\"",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "Hapus pengguna ini dari MySQL",
 "MySQL user '%s'@'%%' already exists" => "Pengguna MySQL '%s'@'%%' sudah ada.",
 "Drop this user from MySQL." => "Hapus pengguna ini dari MySQL.",
+"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak valid",
 "Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
 "MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak valid: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
@@ -49,8 +48,5 @@
 "%d months ago" => "%d bulan yang lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s tersedia. Dapatkan <a href=\"%s\">info lebih lanjut</a>",
-"up to date" => "terbaru",
-"updates check is disabled" => "Pemeriksaan pembaruan dinonaktifkan.",
 "Could not find category \"%s\"" => "Tidak dapat menemukan kategori \"%s\""
 );
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
index 8fdb45a05cdd60c84d18282a2c5cc93363a4ea94..05bb68839536a50f936d5dd3f4c02edd772c20fa 100644
--- a/lib/l10n/is.php
+++ b/lib/l10n/is.php
@@ -27,8 +27,5 @@
 "%d months ago" => "fyrir %d mánuðum",
 "last year" => "síðasta ári",
 "years ago" => "einhverjum árum",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s er í boði. Sækja <a href=\"%s\">meiri upplýsingar</a>",
-"up to date" => "nýjasta útgáfa",
-"updates check is disabled" => "uppfærslupróf er ekki virkjað",
 "Could not find category \"%s\"" => "Fann ekki flokkinn \"%s\""
 );
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 297f1efde056ad7f36e9fbdc1be6fad934f95a8b..db26ac82ae3422663b8f01e72010f14fdf269afd 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -18,14 +18,13 @@
 "Images" => "Immagini",
 "Set an admin username." => "Imposta un nome utente di amministrazione.",
 "Set an admin password." => "Imposta una password di amministrazione.",
-"Specify a data folder." => "Specifica una cartella dei dati.",
 "%s enter the database username." => "%s digita il nome utente del database.",
 "%s enter the database name." => "%s digita il nome del database.",
 "%s you may not use dots in the database name" => "%s non dovresti utilizzare punti nel nome del database",
 "%s set the database host." => "%s imposta l'host del database.",
 "PostgreSQL username and/or password not valid" => "Nome utente e/o password di PostgreSQL non validi",
 "You need to enter either an existing account or the administrator." => "È necessario inserire un account esistente o l'amministratore.",
-"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
+"Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
 "MySQL username and/or password not valid" => "Nome utente e/o password di MySQL non validi",
 "DB Error: \"%s\"" => "Errore DB: \"%s\"",
 "Offending command was: \"%s\"" => "Il comando non consentito era: \"%s\"",
@@ -33,24 +32,22 @@
 "Drop this user from MySQL" => "Elimina questo utente da MySQL",
 "MySQL user '%s'@'%%' already exists" => "L'utente MySQL '%s'@'%%' esiste già",
 "Drop this user from MySQL." => "Elimina questo utente da MySQL.",
+"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
 "Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
 "MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
 "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
 "seconds ago" => "secondi fa",
-"1 minute ago" => "1 minuto fa",
+"1 minute ago" => "Un minuto fa",
 "%d minutes ago" => "%d minuti fa",
 "1 hour ago" => "1 ora fa",
 "%d hours ago" => "%d ore fa",
 "today" => "oggi",
 "yesterday" => "ieri",
 "%d days ago" => "%d giorni fa",
-"last month" => "il mese scorso",
+"last month" => "mese scorso",
 "%d months ago" => "%d mesi fa",
-"last year" => "l'anno scorso",
+"last year" => "anno scorso",
 "years ago" => "anni fa",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s è disponibile. Ottieni <a href=\"%s\">ulteriori informazioni</a>",
-"up to date" => "aggiornato",
-"updates check is disabled" => "il controllo degli aggiornamenti è disabilitato",
 "Could not find category \"%s\"" => "Impossibile trovare la categoria \"%s\""
 );
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 529eec3ac524c58b39a2272070c1f28c057b0550..a2eb4bee67bc6c824c325dd165fe08823519c3a4 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Help" => "ヘルプ",
-"Personal" => "個人設定",
+"Personal" => "個人",
 "Settings" => "設定",
 "Users" => "ユーザ",
 "Apps" => "アプリ",
-"Admin" => "管理者",
+"Admin" => "管理",
 "ZIP download is turned off." => "ZIPダウンロードは無効です。",
 "Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
 "Back to Files" => "ファイルに戻る",
@@ -18,14 +18,13 @@
 "Images" => "画像",
 "Set an admin username." => "管理者のユーザ名を設定。",
 "Set an admin password." => "管理者のパスワードを設定。",
-"Specify a data folder." => "データフォルダを指定。",
 "%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 username and/or password not valid" => "Oracleのユーザ名もしくはパスワードは有効ではありません",
+"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
 "MySQL username and/or password not valid" => "MySQLのユーザ名もしくはパスワードは有効ではありません",
 "DB Error: \"%s\"" => "DBエラー: \"%s\"",
 "Offending command was: \"%s\"" => "違反コマンド: \"%s\"",
@@ -33,24 +32,22 @@
 "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." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
-"seconds ago" => "秒前",
-"1 minute ago" => "1分前",
+"seconds ago" => "数秒前",
+"1 minute ago" => "1 分前",
 "%d minutes ago" => "%d 分前",
 "1 hour ago" => "1 時間前",
 "%d hours ago" => "%d 時間前",
 "today" => "今日",
 "yesterday" => "昨日",
 "%d days ago" => "%d 日前",
-"last month" => "先月",
+"last month" => "一月前",
 "%d months ago" => "%d 分前",
-"last year" => "昨年",
+"last year" => "一年前",
 "years ago" => "年前",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s が利用可能です。<a href=\"%s\">詳細情報</a> を確認ください",
-"up to date" => "最新です",
-"updates check is disabled" => "更新チェックは無効です",
 "Could not find category \"%s\"" => "カテゴリ \"%s\" が見つかりませんでした"
 );
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index 26b356b63414704137b6b18769eb395d5684256d..93835e4ead7a69ba3f2b512bcc79061c260ffa86 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -18,14 +18,12 @@
 "Images" => "სურათები",
 "Set an admin username." => "დააყენეთ ადმინისტრატორის სახელი.",
 "Set an admin password." => "დააყენეთ ადმინისტრატორის პაროლი.",
-"Specify a data folder." => "მიუთითეთ data ფოლდერი.",
 "%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 username and/or password not valid" => "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
 "MySQL username and/or password not valid" => "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
 "DB Error: \"%s\"" => "DB შეცდომა: \"%s\"",
 "Offending command was: \"%s\"" => "Offending ბრძანება იყო: \"%s\"",
@@ -33,6 +31,7 @@
 "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" => "Offending ბრძანება იყო: \"%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 ინტერფეისი შეიძლება იყოს გატეხილი.",
@@ -49,8 +48,5 @@
 "%d months ago" => "%d თვის წინ",
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s ხელმისაწვდომია. მიიღეთ <a href=\"%s\">უფრო მეტი ინფორმაცია</a>",
-"up to date" => "განახლებულია",
-"updates check is disabled" => "განახლების ძებნა გათიშულია",
 "Could not find category \"%s\"" => "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა"
 );
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index 859657f46b4d376a7e0ee0b515f611723619acb8..bf2a68369f162d265eaf4acb31e63c808cf0342e 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -28,8 +28,5 @@
 "%d months ago" => "%d개월 전",
 "last year" => "ìž‘ë…„",
 "years ago" => "ë…„ ì „",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s을(를) 사용할 수 있습니다. <a href=\"%s\">자세한 정보 보기</a>",
-"up to date" => "최신",
-"updates check is disabled" => "업데이트 확인이 비활성화됨",
 "Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다."
 );
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index f3165b8586b14a99f6cda6f196b619c1e1cdc7ad..20d0249f5691341033c76a6627e7bcaff0a53a53 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -2,5 +2,6 @@
 "Help" => "یارمەتی",
 "Settings" => "ده‌ستكاری",
 "Users" => "به‌كارهێنه‌ر",
+"Apps" => "به‌رنامه‌كان",
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 );
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 16f1f674e95f79ce1dde4d2348931e300d49cf31..889fc3a377df48bd328e85f9c7022810315cdb78 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -2,6 +2,8 @@
 "Help" => "Hëllef",
 "Personal" => "Perséinlech",
 "Settings" => "Astellungen",
+"Users" => "Benotzer",
+"Apps" => "Applicatiounen",
 "Admin" => "Admin",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Files" => "Dateien",
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index b84c155633b33d6ce1ae226714ea2524c64b4ac5..cebaa6937d8f482f1a9d1f68bd572d6ab5ae43a8 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -14,16 +14,13 @@
 "Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
 "Files" => "Failai",
 "Text" => "Žinučių",
-"seconds ago" => "prieš kelias sekundes",
-"1 minute ago" => "prieš 1 minutę",
+"seconds ago" => "prieš sekundę",
+"1 minute ago" => "Prieš 1 minutę",
 "%d minutes ago" => "prieš %d minučių",
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
 "%d days ago" => "prieš %d dienų",
-"last month" => "praėjusį mėnesį",
-"last year" => "pereitais metais",
-"years ago" => "prieš metus",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s yra galimas. Platesnė <a href=\"%s\">informacija čia</a>",
-"up to date" => "pilnai atnaujinta",
-"updates check is disabled" => "atnaujinimų tikrinimas išjungtas"
+"last month" => "praeitą mėnesį",
+"last year" => "praeitais metais",
+"years ago" => "prieš metus"
 );
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index c73d306ca0a6df932c8cef3afad80ced97101ac7..140c75af3ce66f6f8fed701000a116b3637e01b6 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -18,14 +18,12 @@
 "Images" => "Attēli",
 "Set an admin username." => "Iestatiet administratora lietotājvārdu.",
 "Set an admin password." => "Iestatiet administratora paroli.",
-"Specify a data folder." => "Norādiet datu mapi.",
 "%s enter the database username." => "%s ievadiet datubāzes lietotājvārdu.",
 "%s enter the database name." => "%s ievadiet datubāzes nosaukumu.",
 "%s you may not use dots in the database name" => "%s datubāžu nosaukumos nedrīkst izmantot punktus",
 "%s set the database host." => "%s iestatiet datubāžu serveri.",
 "PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
 "You need to enter either an existing account or the administrator." => "Jums jāievada vai nu esošs vai administratora konts.",
-"Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
 "MySQL username and/or password not valid" => "Nav derīga MySQL parole un/vai lietotājvārds",
 "DB Error: \"%s\"" => "DB kļūda — “%s”",
 "Offending command was: \"%s\"" => "Vainīgā komanda bija “%s”",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "Izmest šo lietotāju no MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē",
 "Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
+"Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
 "Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
 "MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
@@ -49,8 +48,5 @@
 "%d months ago" => "pirms %d mēnešiem",
 "last year" => "gājušajā gadā",
 "years ago" => "gadus atpakaļ",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s ir pieejams. Iegūt <a href=\"%s\">vairāk informācijas</a>",
-"up to date" => "ir aktuāls",
-"updates check is disabled" => "atjauninājumu pārbaude ir deaktivēta",
 "Could not find category \"%s\"" => "Nevarēja atrast kategoriju “%s”"
 );
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 5b3efffb22a198d9464aa6218b6ba97c20091e29..34790c93745da0585dda0fa713f87fc0918c3c37 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Помош",
 "Personal" => "Лично",
-"Settings" => "Параметри",
+"Settings" => "Подесувања",
 "Users" => "Корисници",
 "Apps" => "Аппликации",
 "Admin" => "Админ",
@@ -27,8 +27,5 @@
 "%d months ago" => "пред %d месеци",
 "last year" => "минатата година",
 "years ago" => "пред години",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s е достапно. Земи <a href=\"%s\">повеќе информации</a>",
-"up to date" => "ажурно",
-"updates check is disabled" => "проверката за ажурирања е оневозможена",
 "Could not find category \"%s\"" => "Не можам да најдам категорија „%s“"
 );
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index 732ea96c6b700d3d8330c711a60c87f6ca7925f0..6abbbe86e804794e2f77475790e3a4f8b72e9194 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -3,6 +3,7 @@
 "Personal" => "Peribadi",
 "Settings" => "Tetapan",
 "Users" => "Pengguna",
+"Apps" => "Aplikasi",
 "Admin" => "Admin",
 "Authentication error" => "Ralat pengesahan",
 "Files" => "Fail-fail",
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index d725a06a3a99bb97c945a2ce7f884f999b1381be..5d1812fd742ad4a6919c6c4fa5272d068e4bec6e 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -24,8 +24,5 @@
 "%d months ago" => "%d လအရင်က",
 "last year" => "မနှစ်က",
 "years ago" => "နှစ် အရင်က",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s ကိုရရှိနိုင်ပါပြီ။ <a href=\"%s\">နောက်ထပ်အချက်အလက်များ</a>ရယူပါ။",
-"up to date" => "နောက်ဆုံးပေါ်",
-"updates check is disabled" => "နောက်ဆုံးပေါ်စစ်ဆေးခြင်းကိုပိတ်ထားသည်",
 "Could not find category \"%s\"" => "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
 );
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index 01144672caa8aff88b93534db1570cca893b1347..23146154c77b1228256c9602ec0c7763ce8d8441 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -10,11 +10,13 @@
 "Back to Files" => "Tilbake til filer",
 "Selected files too large to generate zip file." => "De valgte filene er for store til å kunne generere ZIP-fil",
 "Application is not enabled" => "Applikasjon er ikke påslått",
-"Authentication error" => "Autentiseringsfeil",
+"Authentication error" => "Autentikasjonsfeil",
 "Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
 "Files" => "Filer",
 "Text" => "Tekst",
 "Images" => "Bilder",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minutt siden",
 "%d minutes ago" => "%d minutter siden",
@@ -25,10 +27,7 @@
 "%d days ago" => "%d dager siden",
 "last month" => "forrige måned",
 "%d months ago" => "%d måneder siden",
-"last year" => "i fjor",
+"last year" => "forrige år",
 "years ago" => "Ã¥r siden",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgjengelig. FÃ¥  <a href=\"%s\">mer informasjon</a>",
-"up to date" => "oppdatert",
-"updates check is disabled" => "versjonssjekk er avslått",
 "Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\""
 );
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 10a4060e1194933aa5352c184bbefbfeca3a8d19..2a6086a5968fb3082830050909f777db76c34dff 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -18,14 +18,13 @@
 "Images" => "Afbeeldingen",
 "Set an admin username." => "Stel de gebruikersnaam van de beheerder in.",
 "Set an admin password." => "Stel een beheerderswachtwoord in.",
-"Specify a data folder." => "Geef een datamap op.",
 "%s enter the database username." => "%s opgeven database gebruikersnaam.",
 "%s enter the database name." => "%s opgeven databasenaam.",
 "%s you may not use dots in the database name" => "%s er mogen geen puntjes in de databasenaam voorkomen",
 "%s set the database host." => "%s instellen databaseservernaam.",
 "PostgreSQL username and/or password not valid" => "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
 "You need to enter either an existing account or the administrator." => "Geef of een bestaand account op of het beheerdersaccount.",
-"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
+"Oracle connection could not be established" => "Er kon geen verbinding met Oracle worden bereikt",
 "MySQL username and/or password not valid" => "MySQL gebruikersnaam en/of wachtwoord ongeldig",
 "DB Error: \"%s\"" => "DB Fout: \"%s\"",
 "Offending command was: \"%s\"" => "Onjuiste commande was: \"%s\"",
@@ -33,6 +32,7 @@
 "Drop this user from MySQL" => "Verwijder deze gebruiker uit MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al",
 "Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.",
+"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
 "MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
@@ -49,8 +49,5 @@
 "%d months ago" => "%d maanden geleden",
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s is beschikbaar. Verkrijg <a href=\"%s\">meer informatie</a>",
-"up to date" => "bijgewerkt",
-"updates check is disabled" => "Meest recente versie controle is uitgeschakeld",
 "Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden"
 );
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index 4de21cd9c23a88a47de7e4bb0bc74b90ab7c0780..8241573f9aeda9afeff0e54a914fa712045fdb70 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -3,8 +3,19 @@
 "Personal" => "Personleg",
 "Settings" => "Innstillingar",
 "Users" => "Brukarar",
+"Apps" => "Program",
 "Admin" => "Administrer",
 "Authentication error" => "Feil i autentisering",
 "Files" => "Filer",
-"Text" => "Tekst"
+"Text" => "Tekst",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+"seconds ago" => "sekund sidan",
+"1 minute ago" => "1 minutt sidan",
+"1 hour ago" => "1 time sidan",
+"today" => "i dag",
+"yesterday" => "i går",
+"last month" => "førre månad",
+"last year" => "i fjor",
+"years ago" => "Ã¥r sidan"
 );
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index 89161393380afac47d484ff194e47619f07cea39..85e2a27b431034519f3dee9b83807fb021223762 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -18,7 +18,5 @@
 "%d days ago" => "%d jorns a",
 "last month" => "mes passat",
 "last year" => "an passat",
-"years ago" => "ans a",
-"up to date" => "a jorn",
-"updates check is disabled" => "la verificacion de mesa a jorn es inactiva"
+"years ago" => "ans a"
 );
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 9a1a5e836c975b408353b1c08b6a1e81b2a4d43d..53a9290785c9e200b3b83fbd3a3b89cdc4ba5232 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -18,14 +18,13 @@
 "Images" => "Obrazy",
 "Set an admin username." => "Ustaw nazwÄ™ administratora.",
 "Set an admin password." => "Ustaw hasło administratora.",
-"Specify a data folder." => "Określ folder danych.",
 "%s enter the database username." => "%s wpisz nazwę użytkownika do  bazy",
 "%s enter the database name." => "%s wpisz nazwÄ™ bazy.",
 "%s you may not use dots in the database name" => "%s nie można używać kropki w nazwie bazy danych",
 "%s set the database host." => "%s ustaw hosta bazy danych.",
 "PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
-"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
 "MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "DB Error: \"%s\"" => "BÅ‚Ä…d DB: \"%s\"",
 "Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
@@ -33,24 +32,22 @@
 "Drop this user from MySQL" => "Usuń tego użytkownika z MySQL",
 "MySQL user '%s'@'%%' already exists" => "Użytkownik MySQL  '%s'@'%%t' już istnieje",
 "Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
+"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s",
 "MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer www nie jest jeszcze poprawnie ustawiony, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony. Sprawdź ustawienia serwera.",
-"Please double check the <a href='%s'>installation guides</a>." => "Proszę sprawdź ponownie <a href='%s'>przewodnik instalacji</a>.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
 "seconds ago" => "sekund temu",
 "1 minute ago" => "1 minutÄ™ temu",
 "%d minutes ago" => "%d minut temu",
-"1 hour ago" => "1 godzine temu",
+"1 hour ago" => "1 godzinÄ™ temu",
 "%d hours ago" => "%d godzin temu",
-"today" => "dzisiaj",
+"today" => "dziÅ›",
 "yesterday" => "wczoraj",
 "%d days ago" => "%d dni temu",
-"last month" => "ostatni miesiÄ…c",
+"last month" => "w zeszłym miesiącu",
 "%d months ago" => "%d miesiecy temu",
-"last year" => "ostatni rok",
+"last year" => "w zeszłym roku",
 "years ago" => "lat temu",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s jest dostępna. Uzyskaj <a href=\"%s\">więcej informacji</a>",
-"up to date" => "Aktualne",
-"updates check is disabled" => "wybór aktualizacji jest wyłączony",
 "Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\""
 );
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index d4f410d8885d1f2f9ec66f8cd4711620bfb8d81d..9606477d945a1e9141dd55426d36cd7acb080a1b 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -18,14 +18,13 @@
 "Images" => "Imagens",
 "Set an admin username." => "Defina um nome de usuário de administrador.",
 "Set an admin password." => "Defina uma senha de administrador.",
-"Specify a data folder." => "Especifique uma pasta de dados.",
 "%s enter the database username." => "%s insira o nome de usuário do banco de dados.",
 "%s enter the database name." => "%s insira o nome do banco de dados.",
 "%s you may not use dots in the database name" => "%s você não pode usar pontos no nome do banco de dados",
 "%s set the database host." => "%s defina o host do banco de dados.",
 "PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
 "You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou o administrador.",
-"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
+"Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
 "MySQL username and/or password not valid" => "Nome de usuário e/ou senha MySQL inválido(s)",
 "DB Error: \"%s\"" => "Erro no BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
@@ -33,6 +32,7 @@
 "Drop this user from MySQL" => "Derrubar este usuário do MySQL",
 "MySQL user '%s'@'%%' already exists" => "Usuário MySQL '%s'@'%%' já existe",
 "Drop this user from MySQL." => "Derrube este usuário do MySQL.",
+"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
 "MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
@@ -49,8 +49,5 @@
 "%d months ago" => "%d meses atrás",
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponível. Obtenha <a href=\"%s\">mais informações</a>",
-"up to date" => "atualizado",
-"updates check is disabled" => "checagens de atualização estão desativadas",
 "Could not find category \"%s\"" => "Impossível localizar categoria \"%s\""
 );
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 2c813f5b07c9fc76fe8d7cafd550190f2b89e209..f49258157edba3f5d3302e8b35f88e7ec709e936 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -18,14 +18,13 @@
 "Images" => "Imagens",
 "Set an admin username." => "Definir um nome de utilizador de administrador",
 "Set an admin password." => "Definiar uma password de administrador",
-"Specify a data folder." => "Especificar a pasta para os dados.",
 "%s enter the database username." => "%s introduza o nome de utilizador da base de dados",
 "%s enter the database name." => "%s introduza o nome da base de dados",
 "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
 "%s set the database host." => "%s defina o servidor da base de dados (geralmente localhost)",
 "PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
 "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
-"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
+"Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
 "MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida",
 "DB Error: \"%s\"" => "Erro na BD: \"%s\"",
 "Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
@@ -33,24 +32,22 @@
 "Drop this user from MySQL" => "Eliminar este utilizador do MySQL",
 "MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe",
 "Drop this user from MySQL." => "Eliminar este utilizador do MySQL",
+"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
 "Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
 "MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
-"seconds ago" => "há alguns segundos",
-"1 minute ago" => "há 1 minuto",
+"seconds ago" => "Minutos atrás",
+"1 minute ago" => "Há 1 minuto",
 "%d minutes ago" => "há %d minutos",
 "1 hour ago" => "Há 1 horas",
 "%d hours ago" => "Há %d horas",
 "today" => "hoje",
 "yesterday" => "ontem",
 "%d days ago" => "há %d dias",
-"last month" => "mês passado",
+"last month" => "ultímo mês",
 "%d months ago" => "Há %d meses atrás",
 "last year" => "ano passado",
-"years ago" => "há anos",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponível. Obtenha <a href=\"%s\">mais informação</a>",
-"up to date" => "actualizado",
-"updates check is disabled" => "a verificação de actualizações está desligada",
+"years ago" => "anos atrás",
 "Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\""
 );
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 3f8e59cdac2d3f387595a00374e40c600fc2dd07..6661caf86e735f62d56e57b99e0ef48aa72fca73 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -28,8 +28,5 @@
 "%d months ago" => "%d luni in urma",
 "last year" => "ultimul an",
 "years ago" => "ani în urmă",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s este disponibil. Vezi <a href=\"%s\">mai multe informații</a>",
-"up to date" => "la zi",
-"updates check is disabled" => "verificarea după actualizări este dezactivată",
 "Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\""
 );
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 25a88d5efc2bf4d272b97d06e60472ffd7ed4cf9..e077b688c09333fb26761bc662fb1572671e97ef 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Помощь",
 "Personal" => "Личное",
-"Settings" => "Настройки",
+"Settings" => "Конфигурация",
 "Users" => "Пользователи",
 "Apps" => "Приложения",
 "Admin" => "Admin",
@@ -18,14 +18,12 @@
 "Images" => "Изображения",
 "Set an admin username." => "Установить имя пользователя для admin.",
 "Set an admin password." => "становит пароль для admin.",
-"Specify a data folder." => "Указать папку данных.",
 "%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 username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
 "MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
 "DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
@@ -33,11 +31,12 @@
 "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." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
 "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
-"seconds ago" => "менее минуты",
+"seconds ago" => "несколько секунд назад",
 "1 minute ago" => "1 минуту назад",
 "%d minutes ago" => "%d минут назад",
 "1 hour ago" => "час назад",
@@ -48,9 +47,6 @@
 "last month" => "в прошлом месяце",
 "%d months ago" => "%d месяцев назад",
 "last year" => "в прошлом году",
-"years ago" => "годы назад",
-"%s is available. Get <a href=\"%s\">more information</a>" => "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>",
-"up to date" => "актуальная версия",
-"updates check is disabled" => "проверка обновлений отключена",
+"years ago" => "несколько лет назад",
 "Could not find category \"%s\"" => "Категория \"%s\"  не найдена"
 );
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index de77056366233fbd8f6f98a5c2dceda804822893..7639a3cc97e4f605e1343ad34ee941cc1fddb2cb 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -1,37 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Help" => "Помощь",
-"Personal" => "Персональный",
 "Settings" => "Настройки",
-"Users" => "Пользователи",
-"Apps" => "Приложения",
-"Admin" => "Админ",
-"ZIP download is turned off." => "Загрузка ZIP выключена.",
-"Files need to be downloaded one by one." => "Файлы должны быть загружены один за другим.",
-"Back to Files" => "Обратно к файлам",
-"Selected files too large to generate zip file." => "Выбранные файлы слишком велики для генерации zip-архива.",
-"couldn't be determined" => "не может быть определено",
-"Application is not enabled" => "Приложение не запущено",
-"Authentication error" => "Ошибка аутентификации",
-"Token expired. Please reload page." => "Маркер истек. Пожалуйста, перезагрузите страницу.",
-"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 минут назад",
-"1 hour ago" => "1 час назад",
-"%d hours ago" => "%d часов назад",
-"today" => "сегодня",
-"yesterday" => "вчера",
-"%d days ago" => "%d дней назад",
-"last month" => "в прошлом месяце",
-"%d months ago" => "%d месяцев назад",
-"last year" => "в прошлом году",
-"years ago" => "год назад",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s доступно. Получите <a href=\"%s\">more information</a>",
-"up to date" => "до настоящего времени",
-"updates check is disabled" => "Проверка обновлений отключена",
-"Could not find category \"%s\"" => "Не удалось найти категорию \"%s\""
+"Text" => "Текст"
 );
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index 25624acf705ca0e9b56488abfb3aa76fc5a106f0..4846fdcc06675177e7daf68911bdf183375f2542 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -10,7 +10,7 @@
 "Back to Files" => "ගොනු වෙතට නැවත යන්න",
 "Selected files too large to generate zip file." => "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය.",
 "Application is not enabled" => "යෙදුම සක්‍රිය කර නොමැත",
-"Authentication error" => "සත්‍යාපනය කිරීමේ දෝශයක්",
+"Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Token expired. Please reload page." => "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
 "Files" => "ගොනු",
 "Text" => "පෙළ",
@@ -23,8 +23,5 @@
 "%d days ago" => "%d දිනකට පෙර",
 "last month" => "පෙර මාසයේ",
 "last year" => "පෙර අවුරුද්දේ",
-"years ago" => "අවුරුදු කීපයකට පෙර",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s යොදාගත හැක. <a href=\"%s\">තව විස්තර</a> ලබාගන්න",
-"up to date" => "යාවත්කාලීනයි",
-"updates check is disabled" => "යාවත්කාලීන බව පරීක්ෂණය අක්‍රියයි"
+"years ago" => "අවුරුදු කීපයකට පෙර"
 );
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 8c9ce61622c9fbbc1ec6f989f59c7f306d0b7d82..c1ec2470b46c5bd08833f95338ccffe6efcd0fb2 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -18,14 +18,13 @@
 "Images" => "Obrázky",
 "Set an admin username." => "Zadajte používateľské meno administrátora.",
 "Set an admin password." => "Zadajte heslo administrátora.",
-"Specify a data folder." => "Zadajte priečinok pre dáta.",
 "%s enter the database username." => "Zadajte používateľské meno %s databázy..",
 "%s enter the database name." => "Zadajte názov databázy pre %s databázy.",
 "%s you may not use dots in the database name" => "V názve databázy %s nemôžete používať bodky",
 "%s set the database host." => "Zadajte názov počítača s databázou %s.",
 "PostgreSQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
 "You need to enter either an existing account or the administrator." => "Musíte zadať jestvujúci účet alebo administrátora.",
-"Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
+"Oracle connection could not be established" => "Nie je možné pripojiť sa k Oracle",
 "MySQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné",
 "DB Error: \"%s\"" => "Chyba DB: \"%s\"",
 "Offending command was: \"%s\"" => "Podozrivý príkaz bol: \"%s\"",
@@ -33,12 +32,13 @@
 "Drop this user from MySQL" => "Zahodiť používateľa z MySQL.",
 "MySQL user '%s'@'%%' already exists" => "Používateľ '%s'@'%%' už v MySQL existuje",
 "Drop this user from MySQL." => "Zahodiť používateľa z MySQL.",
+"Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
 "MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
 "Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
 "seconds ago" => "pred sekundami",
-"1 minute ago" => "pred 1 minútou",
+"1 minute ago" => "pred minútou",
 "%d minutes ago" => "pred %d minútami",
 "1 hour ago" => "Pred 1 hodinou",
 "%d hours ago" => "Pred %d hodinami.",
@@ -49,8 +49,5 @@
 "%d months ago" => "Pred %d mesiacmi.",
 "last year" => "minulý rok",
 "years ago" => "pred rokmi",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s je dostupné. Získať <a href=\"%s\">pre viac informácií</a>",
-"up to date" => "aktuálny",
-"updates check is disabled" => "sledovanie aktualizácií je vypnuté",
 "Could not find category \"%s\"" => "Nemožno nájsť danú kategóriu \"%s\""
 );
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index a2e1719de87ea56f2a4387baf2618bbcc8410899..7f8827d17f32c51f012be394d048a323b330781e 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -11,21 +11,19 @@
 "Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.",
 "couldn't be determined" => "ni mogoče določiti",
 "Application is not enabled" => "Program ni omogočen",
-"Authentication error" => "Napaka overitve",
+"Authentication error" => "Napaka pri overjanju",
 "Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.",
 "Files" => "Datoteke",
 "Text" => "Besedilo",
 "Images" => "Slike",
 "Set an admin username." => "Nastavi uporabniško ime skrbnika.",
 "Set an admin password." => "Nastavi geslo skrbnika.",
-"Specify a data folder." => "Določi podatkovno mapo.",
 "%s enter the database username." => "%s - vnos uporabniškega imena podatkovne zbirke.",
 "%s enter the database name." => "%s - vnos imena podatkovne zbirke.",
 "%s you may not use dots in the database name" => "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.",
 "%s set the database host." => "%s - vnos gostitelja podatkovne zbirke.",
 "PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
 "You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
-"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
 "MySQL username and/or password not valid" => "Uporabniško ime ali geslo MySQL ni veljavno",
 "DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"",
 "Offending command was: \"%s\"" => "Napačni ukaz je: \"%s\"",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "Odstrani uporabnika s podatkovne zbirke MySQL",
 "MySQL user '%s'@'%%' already exists" => "Uporabnik MySQL '%s'@'%%' že obstaja.",
 "Drop this user from MySQL." => "Odstrani uporabnika s podatkovne zbirke MySQL",
+"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
 "Offending command was: \"%s\", name: %s, password: %s" => "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
 "MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.",
@@ -45,12 +44,9 @@
 "today" => "danes",
 "yesterday" => "včeraj",
 "%d days ago" => "pred %d dnevi",
-"last month" => "prejšnji mesec",
+"last month" => "zadnji mesec",
 "%d months ago" => "Pred %d meseci",
 "last year" => "lansko leto",
-"years ago" => "pred nekaj leti",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več podrobnosti.</a>",
-"up to date" => "posodobljeno",
-"updates check is disabled" => "preverjanje za posodobitve je onemogočeno",
+"years ago" => "let nazaj",
 "Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoče najti."
 );
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index 743c52850ac7146e4df116c0bef00fbfbc67a259..04186f62102832ce82155034ee00e057c3b1e3e8 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Help" => "Ndihmë",
 "Personal" => "Personale",
-"Settings" => "Parametrat",
+"Settings" => "Parametra",
 "Users" => "Përdoruesit",
 "Apps" => "App",
 "Admin" => "Admin",
@@ -18,14 +18,12 @@
 "Images" => "Foto",
 "Set an admin username." => "Cakto emrin e administratorit.",
 "Set an admin password." => "Cakto kodin e administratorit.",
-"Specify a data folder." => "Specifiko dosjen e të dhënave.",
 "%s enter the database username." => "% shkruani përdoruesin e database-it.",
 "%s enter the database name." => "%s shkruani emrin e database-it.",
 "%s you may not use dots in the database name" => "%s nuk mund të përdorni pikat tek emri i database-it",
 "%s set the database host." => "%s caktoni pozicionin (host) e database-it.",
 "PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
 "You need to enter either an existing account or the administrator." => "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
-"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
 "MySQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm.",
 "DB Error: \"%s\"" => "Veprim i gabuar i DB-it: \"%s\"",
 "Offending command was: \"%s\"" => "Komanda e gabuar ishte: \"%s\"",
@@ -33,6 +31,7 @@
 "Drop this user from MySQL" => "Eliminoni këtë përdorues nga MySQL",
 "MySQL user '%s'@'%%' already exists" => "Përdoruesi MySQL '%s'@'%%' ekziston",
 "Drop this user from MySQL." => "Eliminoni këtë përdorues nga MySQL.",
+"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
 "Offending command was: \"%s\", name: %s, password: %s" => "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
 "MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "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.",
@@ -49,8 +48,5 @@
 "%d months ago" => "%d muaj më parë",
 "last year" => "vitin e shkuar",
 "years ago" => "vite më parë",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s është i disponueshëm. <a href=\"%s\">Informohuni këtu</a>",
-"up to date" => "i azhornuar",
-"updates check is disabled" => "kontrollimi i azhurnimeve është i çaktivizuar",
 "Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet"
 );
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 1161b0a44b75cbf25e74377ba412ce7dd0bbc628..45b8e06200cc6320a8cb1fd2205da3c06573a778 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -16,10 +16,12 @@
 "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 минута",
-"1 hour ago" => "пре 1 сат",
+"1 hour ago" => "Пре једног сата",
 "%d hours ago" => "пре %d сата/и",
 "today" => "данас",
 "yesterday" => "јуче",
@@ -28,8 +30,5 @@
 "%d months ago" => "пре %d месеца/и",
 "last year" => "прошле године",
 "years ago" => "година раније",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s је доступна. Погледајте <a href=\"%s\">више информација</a>.",
-"up to date" => "је ажурна",
-"updates check is disabled" => "провера ажурирања је онемогућена",
 "Could not find category \"%s\"" => "Не могу да пронађем категорију „%s“."
 );
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
index 2f0a97fd77f3b655c7967d5baa706b9ab412539e..13cedc832791bab4f8bdb66b4f47fe16fe227a52 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -3,6 +3,7 @@
 "Personal" => "Lično",
 "Settings" => "Podešavanja",
 "Users" => "Korisnici",
+"Apps" => "Programi",
 "Admin" => "Adninistracija",
 "Authentication error" => "Greška pri autentifikaciji",
 "Files" => "Fajlovi",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 63ca60e89cdee59070e7e97fa44e6f336f04da85..3dcb26d5d8d0499b994b1a13d0bd6214220a838d 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -23,15 +23,12 @@
 "%d minutes ago" => "%d minuter sedan",
 "1 hour ago" => "1 timme sedan",
 "%d hours ago" => "%d timmar sedan",
-"today" => "idag",
-"yesterday" => "igår",
+"today" => "i dag",
+"yesterday" => "i går",
 "%d days ago" => "%d dagar sedan",
 "last month" => "förra månaden",
 "%d months ago" => "%d månader sedan",
 "last year" => "förra året",
 "years ago" => "Ã¥r sedan",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s finns. FÃ¥ <a href=\"%s\">mer information</a>",
-"up to date" => "uppdaterad",
-"updates check is disabled" => "uppdateringskontroll är inaktiverad",
 "Could not find category \"%s\"" => "Kunde inte hitta kategorin \"%s\""
 );
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
index c76394bcb4f9c815607d280cdab5fb4acf950229..c9bb578b40f665ceb4e15fba1af7549207a06c80 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/l10n/ta_LK.php
@@ -2,7 +2,7 @@
 "Help" => "உதவி",
 "Personal" => "தனிப்பட்ட",
 "Settings" => "அமைப்புகள்",
-"Users" => "பயனாளர்கள்",
+"Users" => "பயனாளர்",
 "Apps" => "செயலிகள்",
 "Admin" => "நிர்வாகம்",
 "ZIP download is turned off." => "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது.",
@@ -27,8 +27,5 @@
 "%d months ago" => "%d மாதத்திற்கு முன்",
 "last year" => "கடந்த வருடம்",
 "years ago" => "வருடங்களுக்கு முன்",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s இன்னும் இருக்கின்றன. <a href=\"%s\">மேலதிக தகவல்களுக்கு</a> எடுக்க",
-"up to date" => "நவீன",
-"updates check is disabled" => "இற்றைப்படுத்தலை சரிபார்ப்பதை செயலற்றதாக்குக",
 "Could not find category \"%s\"" => "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை"
 );
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 0da607a058957f584a85dce502c2bf1962019c36..7cda4ab6ae6d52b41f8d31a3bbc5b3de6aea0f67 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -16,8 +16,8 @@
 "Files" => "ไฟล์",
 "Text" => "ข้อความ",
 "Images" => "รูปภาพ",
-"seconds ago" => "วินาทีที่ผ่านมา",
-"1 minute ago" => "1 นาทีมาแล้ว",
+"seconds ago" => "วินาที ก่อนหน้านี้",
+"1 minute ago" => "1 นาทีก่อนหน้านี้",
 "%d minutes ago" => "%d นาทีที่ผ่านมา",
 "1 hour ago" => "1 ชั่วโมงก่อนหน้านี้",
 "%d hours ago" => "%d ชั่วโมงก่อนหน้านี้",
@@ -27,9 +27,6 @@
 "last month" => "เดือนที่แล้ว",
 "%d months ago" => "%d เดือนมาแล้ว",
 "last year" => "ปีที่แล้ว",
-"years ago" => "ปีที่ผ่านมา",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s พร้อมให้ใช้งานได้แล้ว. <a href=\"%s\">ดูรายละเอียดเพิ่มเติม</a>",
-"up to date" => "ทันสมัย",
-"updates check is disabled" => "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้",
+"years ago" => "ปี ที่ผ่านมา",
 "Could not find category \"%s\"" => "ไม่พบหมวดหมู่ \"%s\""
 );
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 84278f6d4c44fe0d3e4046549dc4cc5f90497579..7996447b95d39147df55eb53ec36ca25ee659f02 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Help" => "Yardı",
+"Help" => "Yardım",
 "Personal" => "KiÅŸisel",
 "Settings" => "Ayarlar",
 "Users" => "Kullanıcılar",
@@ -16,6 +16,24 @@
 "Files" => "Dosyalar",
 "Text" => "Metin",
 "Images" => "Resimler",
+"Set an admin username." => "Bir adi kullanici vermek. ",
+"Set an admin password." => "Parola yonetici birlemek. ",
+"%s enter the database username." => "%s veritabanı kullanıcı adını gir.",
+"%s enter the database name." => "%s veritabanı adını gir.",
+"%s you may not use dots in the database name" => "%s veritabanı adında nokta kullanamayabilirsiniz",
+"%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. ",
+"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''. ",
+"MySQL user '%s'@'localhost' exists already." => "MySQL kullanici '%s @local host zatan var. ",
+"Drop this user from MySQL" => "Bu kullanici MySQLden list disari koymak. ",
+"MySQL user '%s'@'%%' already exists" => "MySQL kullanici '%s @ % % zaten var (zaten yazili)",
+"Drop this user from MySQL." => "Bu kulanıcıyı MySQL veritabanından kaldır",
+"Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli deÄŸildir. ",
+"Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
+"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
 "seconds ago" => "saniye önce",
@@ -30,8 +48,5 @@
 "%d months ago" => "%d ay önce",
 "last year" => "geçen yıl",
 "years ago" => "yıl önce",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s kullanılabilir durumda. <a href=\"%s\">Daha fazla bilgi</a> alın",
-"up to date" => "güncel",
-"updates check is disabled" => "güncelleme kontrolü kapalı",
 "Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı"
 );
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..62d91616c1d3cd02a9270195be5d287eb578a673
--- /dev/null
+++ b/lib/l10n/ug.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ياردەم",
+"Personal" => "شەخسىي",
+"Settings" => "تەڭشەكلەر",
+"Users" => "ئىشلەتكۈچىلەر",
+"Apps" => "ئەپلەر",
+"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
+"Files" => "ھۆججەتلەر",
+"Text" => "قىسقا ئۇچۇر",
+"Images" => "سۈرەتلەر",
+"1 minute ago" => "1 مىنۇت ئىلگىرى",
+"%d minutes ago" => "%d مىنۇت ئىلگىرى",
+"1 hour ago" => "1 سائەت ئىلگىرى",
+"%d hours ago" => "%d سائەت ئىلگىرى",
+"today" => "بۈگۈن",
+"yesterday" => "تۈنۈگۈن",
+"%d days ago" => "%d كۈن ئىلگىرى",
+"%d months ago" => "%d ئاي ئىلگىرى"
+);
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 68f7151d15e7ffb1c3c6bcb16301ff2b4369094d..676879629ef37fbbe7cca86f41227d57643594d0 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -18,14 +18,12 @@
 "Images" => "Зображення",
 "Set an admin username." => "Встановіть ім'я адміністратора.",
 "Set an admin password." => "Встановіть пароль адміністратора.",
-"Specify a data folder." => "Вкажіть теку для даних.",
 "%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." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
-"Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
 "MySQL username and/or password not valid" => "MySQL ім'я користувача та/або пароль не дійсні",
 "DB Error: \"%s\"" => "Помилка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"",
@@ -33,6 +31,7 @@
 "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, здається, зламаний.",
@@ -49,8 +48,5 @@
 "%d months ago" => "%d місяців тому",
 "last year" => "минулого року",
 "years ago" => "роки тому",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s доступно. Отримати <a href=\"%s\">детальну інформацію</a>",
-"up to date" => "оновлено",
-"updates check is disabled" => "перевірка оновлень відключена",
 "Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\""
 );
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index ea9660093aee1e4b6c070b94d0034968dc832791..6a4b8ebac938eaaa6ee1450fe2e5872c1ecc4c9e 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -13,10 +13,10 @@
 "Application is not enabled" => "Ứng dụng không được BẬT",
 "Authentication error" => "Lỗi xác thực",
 "Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.",
-"Files" => "Các tập tin",
+"Files" => "Tập tin",
 "Text" => "Văn bản",
 "Images" => "Hình ảnh",
-"seconds ago" => "1 giây trước",
+"seconds ago" => "vài giây trước",
 "1 minute ago" => "1 phút trước",
 "%d minutes ago" => "%d phút trước",
 "1 hour ago" => "1 giờ trước",
@@ -28,8 +28,5 @@
 "%d months ago" => "%d tháng trước",
 "last year" => "năm trước",
 "years ago" => "năm trước",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s có sẵn.  <a href=\"%s\">xem thêm ở đây</a>",
-"up to date" => "đến ngày",
-"updates check is disabled" => "đã TĂT chức năng cập nhật ",
 "Could not find category \"%s\"" => "không thể tìm thấy mục \"%s\""
 );
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 16487339421b1b004e7c88db9f7b13faf58c850d..3ab35f2bafa2088a8bc215f1dd6df2993d709459 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -26,8 +26,5 @@
 "%d days ago" => "%d 天前",
 "last month" => "上个月",
 "last year" => "去年",
-"years ago" => "年前",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s 不可用。获知 <a href=\"%s\">详情</a>",
-"up to date" => "最新",
-"updates check is disabled" => "更新检测已禁用"
+"years ago" => "年前"
 );
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index b79fdfcca1dfea1952285f5aa01dbd46634ee83c..61e405d80583bda00531399302a1aee4edfe4c83 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -18,14 +18,12 @@
 "Images" => "图片",
 "Set an admin username." => "请设置一个管理员用户名。",
 "Set an admin password." => "请设置一个管理员密码。",
-"Specify a data folder." => "请指定一个数据目录。",
 "%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 username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
 "MySQL username and/or password not valid" => "MySQL 数据库用户名和/或密码无效",
 "DB Error: \"%s\"" => "数据库错误：\"%s\"",
 "Offending command was: \"%s\"" => "冲突命令为：\"%s\"",
@@ -33,12 +31,13 @@
 "Drop this user from MySQL" => "建议从 MySQL 数据库中丢弃 Drop 此用户",
 "MySQL user '%s'@'%%' already exists" => "MySQL 用户 '%s'@'%%' 已存在",
 "Drop this user from MySQL." => "建议从 MySQL 数据库中丢弃 Drop 此用户。",
+"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分钟前",
+"seconds ago" => "秒前",
+"1 minute ago" => "一分钟前",
 "%d minutes ago" => "%d 分钟前",
 "1 hour ago" => "1小时前",
 "%d hours ago" => "%d小时前",
@@ -48,9 +47,6 @@
 "last month" => "上月",
 "%d months ago" => "%d 月前",
 "last year" => "去年",
-"years ago" => "几年前",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已存在。点此 <a href=\"%s\">获取更多信息</a>",
-"up to date" => "已更新。",
-"updates check is disabled" => "更新检查功能被禁用。",
+"years ago" => "年前",
 "Could not find category \"%s\"" => "无法找到分类 \"%s\""
 );
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 62a55ebbb47527bcbeba91c65a357ebed60d3778..4e0d50e7fc9dc43ea7223ca9c658bbe7ab30a482 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -5,10 +5,10 @@
 "Users" => "使用者",
 "Apps" => "應用程式",
 "Admin" => "管理",
-"ZIP download is turned off." => "ZIP 下載已關閉",
-"Files need to be downloaded one by one." => "檔案需要逐一下載",
+"ZIP download is turned off." => "ZIP 下載已關閉。",
+"Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
-"Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔",
+"Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。",
 "couldn't be determined" => "無法判斷",
 "Application is not enabled" => "應用程式未啟用",
 "Authentication error" => "認證錯誤",
@@ -16,12 +16,25 @@
 "Files" => "檔案",
 "Text" => "文字",
 "Images" => "圖片",
-"Set an admin username." => "設置一個管理員用戶名。",
-"Set an admin password." => "設置一個管理員密碼。",
-"PostgreSQL username and/or password not valid" => "PostgreSQL用戶名和/或密碼無效",
-"You need to enter either an existing account or the administrator." => "您必須輸入一個現有的賬戶或管理員",
-"Oracle username and/or password not valid" => "Oracle用戶名和/或密碼無效",
-"MySQL username and/or password not valid" => "MySQL用戶名和/或密碼無效",
+"Set an admin username." => "設定管理員帳號。",
+"Set an admin password." => "設定管理員密碼。",
+"%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." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
 "Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
 "seconds ago" => "幾秒前",
@@ -36,8 +49,5 @@
 "%d months ago" => "%d 個月之前",
 "last year" => "去年",
 "years ago" => "幾年前",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已經可用。取得 <a href=\"%s\">更多資訊</a>",
-"up to date" => "最新的",
-"updates check is disabled" => "檢查更新已停用",
 "Could not find category \"%s\"" => "找不到分類：\"%s\""
 );
diff --git a/lib/filesystem.php b/lib/legacy/filesystem.php
similarity index 100%
rename from lib/filesystem.php
rename to lib/legacy/filesystem.php
diff --git a/lib/filesystemview.php b/lib/legacy/filesystemview.php
similarity index 100%
rename from lib/filesystemview.php
rename to lib/legacy/filesystemview.php
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 20df52c27bb114c7082f982d9931d8a9b838a80f..7a11a588330c7a79902fda7e82a25a0fcf4aaebe 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -49,7 +49,8 @@ class OC_Log_Owncloud {
 	public static function write($app, $message, $level) {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
-			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time());
+			$time = date("F d, Y H:i:s", time());
+			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time);
 			$handle = @fopen(self::$logFile, 'a');
 			if ($handle) {
 				fwrite($handle, json_encode($entry)."\n");
diff --git a/lib/mail.php b/lib/mail.php
index 61634632efce4c3bb2330b51fe422fc5c5085878..e15af277a640ee47962a3c070f789eb5e952d1c7 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -113,7 +113,7 @@ class OC_Mail {
 	 */
 	public static function getfooter() {
 
-		$txt="\n--\n";
+		$txt="\n-- \n";
 		$txt.="ownCloud\n";
 		$txt.="Your Cloud, Your Data, Your Way!\n";
 		return($txt);
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 86ce9c6c237533fe0884d1fd788fdba165c428e0..2aac3bbfd27b1b88e6faee225b9144e48497d0d2 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -86,11 +86,11 @@ return array(
 	'vcf' => 'text/vcard',
 	'vcard' => 'text/vcard',
 	'doc'=>'application/msword',
-	'docx'=>'application/msword',
+	'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
 	'xls'=>'application/msexcel',
-	'xlsx'=>'application/msexcel',
+	'xlsx'=>'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
 	'ppt'=>'application/mspowerpoint',
-	'pptx'=>'application/mspowerpoint',
+	'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation',
 	'sgf' => 'application/sgf',
 	'cdr' => 'application/coreldraw',
 	'impress' => 'text/impress',
@@ -98,5 +98,9 @@ return array(
 	'epub' => 'application/epub+zip',
 	'mobi' => 'application/x-mobipocket-ebook',
 	'exe' => 'application',
-	'msi' => 'application'
+	'msi' => 'application',
+	'md' => 'text/markdown',
+	'markdown' => 'text/markdown',
+	'mdown' => 'text/markdown',
+	'mdwn' => 'text/markdown'
 );
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index 8ab378d79c530091387f0c61ab393c68243a1620..729c39056d9548cf873457660a0256d737b3c079 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -22,7 +22,7 @@
 
 class OC_OCS_Result{
 
-	private $data, $message, $statusCode, $items, $perPage;
+	protected $data, $message, $statusCode, $items, $perPage;
 
 	/**
 	 * create the OCS_Result object
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 601046fe691dcf9146371699d060bb03f436b485..cc076a3a845ad2944721cc8346c686434475dc9c 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -1,49 +1,46 @@
 <?php
 /**
-* ownCloud
-*
-* @author Jakob Sack
-* @copyright 2012 Jakob Sack owncloud@jakobsack.de
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Jakob Sack
+ * @copyright 2012 Jakob Sack owncloud@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 /**
- * Public interface of ownCloud forbackground jobs.
+ * Public interface of ownCloud for background jobs.
  */
 
 // use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
 
+use \OC\BackgroundJob\JobList;
+
 /**
- * This class provides functions to manage backgroundjobs in ownCloud
- *
- * There are two kind of background jobs in ownCloud: regular tasks and
- * queued tasks.
+ * This class provides functions to register backgroundjobs in ownCloud
  *
- * Regular tasks have to be registered in appinfo.php and
- * will run on a regular base. Fetching news could be a task that should run
- * frequently.
+ * To create a new backgroundjob create a new class that inharits from either \OC\BackgroundJob\Job,
+ * \OC\BackgroundJob\QueuedJob or \OC\BackgroundJob\TimedJob and register it using
+ * \OCP\BackgroundJob->registerJob($job, $argument), $argument will be passed to the run() function
+ * of the job when the job is executed.
  *
- * Queued tasks have to be registered each time you want to execute them.
- * An example of the queued task would be the creation of the thumbnail. As
- * soon as the user uploads a picture the gallery app registers the queued
- * task "create thumbnail" and saves the path in the parameter instead of doing
- * the work right away. This makes the app more responsive. As soon as the task
- * is done it will be deleted from the list.
+ * A regular Job will be executed every time cron.php is run, a QueuedJob will only run once and a TimedJob
+ * will only run at a specific interval which is to be specified in the constructor of the job by calling
+ * $this->setInterval($interval) with $interval in seconds.
  */
 class BackgroundJob {
 	/**
@@ -59,82 +56,136 @@ class BackgroundJob {
 
 	/**
 	 * @brief sets the background jobs execution type
-	 * @param $type execution type
+	 * @param string $type execution type
 	 * @return boolean
 	 *
 	 * This method sets the execution type of the background jobs. Possible types
 	 * are "none", "ajax", "webcron", "cron"
 	 */
-	public static function setExecutionType( $type ) {
-		return \OC_BackgroundJob::setExecutionType( $type );
+	public static function setExecutionType($type) {
+		return \OC_BackgroundJob::setExecutionType($type);
+	}
+
+	/**
+	 * @param \OC\BackgroundJob\Job|string $job
+	 * @param mixed $argument
+	 */
+	public static function registerJob($job, $argument = null) {
+		$jobList = new JobList();
+		$jobList->add($job, $argument);
 	}
 
 	/**
+	 * @deprecated
 	 * @brief creates a regular task
-	 * @param $klass class name
-	 * @param $method method name
+	 * @param string $klass class name
+	 * @param string $method method name
 	 * @return true
 	 */
-	public static function addRegularTask( $klass, $method ) {
-		return \OC_BackgroundJob_RegularTask::register( $klass, $method );
+	public static function addRegularTask($klass, $method) {
+		self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
+		return true;
 	}
 
 	/**
+	 * @deprecated
 	 * @brief gets all regular tasks
 	 * @return associative array
 	 *
 	 * key is string "$klass-$method", value is array( $klass, $method )
 	 */
 	static public function allRegularTasks() {
-		return \OC_BackgroundJob_RegularTask::all();
+		$jobList = new JobList();
+		$allJobs = $jobList->getAll();
+		$regularJobs = array();
+		foreach ($allJobs as $job) {
+			if ($job instanceof RegularLegacyJob) {
+				$key = implode('-', $job->getArgument());
+				$regularJobs[$key] = $job->getArgument();
+			}
+		}
+		return $regularJobs;
 	}
 
 	/**
+	 * @deprecated
 	 * @brief Gets one queued task
-	 * @param $id ID of the task
+	 * @param int $id ID of the task
 	 * @return associative array
 	 */
-	public static function findQueuedTask( $id ) {
-		return \OC_BackgroundJob_QueuedTask::find( $id );
+	public static function findQueuedTask($id) {
+		$jobList = new JobList();
+		return $jobList->getById($id);
 	}
 
 	/**
+	 * @deprecated
 	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
 	public static function allQueuedTasks() {
-		return \OC_BackgroundJob_QueuedTask::all();
+		$jobList = new JobList();
+		$allJobs = $jobList->getAll();
+		$queuedJobs = array();
+		foreach ($allJobs as $job) {
+			if ($job instanceof QueuedLegacyJob) {
+				$queuedJob = $job->getArgument();
+				$queuedJob['id'] = $job->getId();
+				$queuedJobs[] = $queuedJob;
+			}
+		}
+		return $queuedJobs;
 	}
 
 	/**
+	 * @deprecated
 	 * @brief Gets all queued tasks of a specific app
-	 * @param $app app name
+	 * @param string $app app name
 	 * @return array with associative arrays
 	 */
-	public static function queuedTaskWhereAppIs( $app ) {
-		return \OC_BackgroundJob_QueuedTask::whereAppIs( $app );
+	public static function queuedTaskWhereAppIs($app) {
+		$jobList = new JobList();
+		$allJobs = $jobList->getAll();
+		$queuedJobs = array();
+		foreach ($allJobs as $job) {
+			if ($job instanceof QueuedLegacyJob) {
+				$queuedJob = $job->getArgument();
+				$queuedJob['id'] = $job->getId();
+				if ($queuedJob['app'] === $app) {
+					$queuedJobs[] = $queuedJob;
+				}
+			}
+		}
+		return $queuedJobs;
 	}
 
 	/**
+	 * @deprecated
 	 * @brief queues a task
-	 * @param $app app name
-	 * @param $klass class name
-	 * @param $method method name
-	 * @param $parameters all useful data as text
-	 * @return id of task
+	 * @param string $app app name
+	 * @param string $class class name
+	 * @param string $method method name
+	 * @param string $parameters all useful data as text
+	 * @return int id of task
 	 */
-	public static function addQueuedTask( $app, $klass, $method, $parameters ) {
-		return \OC_BackgroundJob_QueuedTask::add( $app, $klass, $method, $parameters );
+	public static function addQueuedTask($app, $class, $method, $parameters) {
+		self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
+		return true;
 	}
 
 	/**
+	 * @deprecated
 	 * @brief deletes a queued task
-	 * @param $id id of task
-	 * @return true/false
+	 * @param int $id id of task
+	 * @return bool
 	 *
 	 * Deletes a report
 	 */
-	public static function deleteQueuedTask( $id ) {
-		return \OC_BackgroundJob_QueuedTask::delete( $id );
+	public static function deleteQueuedTask($id) {
+		$jobList = new JobList();
+		$job = $jobList->getById($id);
+		if ($job) {
+			$jobList->remove($job);
+		}
 	}
 }
diff --git a/lib/public/share.php b/lib/public/share.php
index 4b337530be8200ecc2d941d19096728998174a0b..81f5515bb4ba1d50522d9a00a364c71aa69c3e7d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -106,6 +106,125 @@ class Share {
 		}
 		return false;
 	}
+	
+	/**
+	* @brief Prepare a path to be passed to DB as file_target
+	* @return string Prepared path
+	*/
+	public static function prepFileTarget( $path ) {
+	
+		// Paths in DB are stored with leading slashes, so add one if necessary
+		if ( substr( $path, 0, 1 ) !== '/' ) {
+		
+			$path = '/' . $path;
+		
+		}
+		
+		return $path;
+	
+	}
+
+	/**
+	* @brief Find which users can access a shared item
+	* @param $path to the file
+	* @param $user owner of the file
+	* @param include owner to the list of users with access to the file
+	* @return array
+	* @note $path needs to be relative to user data dir, e.g. 'file.txt'
+	*       not '/admin/data/file.txt'
+	*/
+	public static function getUsersSharingFile($path, $user, $includeOwner = false) {
+
+		$shares = array();
+		$publicShare = false;
+		$source = -1;
+		$cache = false;
+
+		$view = new \OC\Files\View('/' . $user . '/files/');
+		$meta = $view->getFileInfo(\OC\Files\Filesystem::normalizePath($path));
+
+		if($meta !== false) {
+			$source = $meta['fileid'];
+			$cache = new \OC\Files\Cache\Cache($meta['storage']);
+		}
+
+		while ($source !== -1) {
+
+			// Fetch all shares of this file path from DB
+			$query = \OC_DB::prepare(
+				'SELECT share_with
+				FROM
+				`*PREFIX*share`
+				WHERE
+				item_source = ? AND share_type = ?'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_USER));
+
+			if (\OCP\DB::isError($result)) {
+				\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			} else {
+				while ($row = $result->fetchRow()) {
+					$shares[] = $row['share_with'];
+				}
+			}
+			// We also need to take group shares into account
+
+			$query = \OC_DB::prepare(
+				'SELECT share_with
+				FROM
+				`*PREFIX*share`
+				WHERE
+				item_source = ? AND share_type = ?'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
+
+			if (\OCP\DB::isError($result)) {
+				\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			} else {
+				while ($row = $result->fetchRow()) {
+					$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
+					$shares = array_merge($shares, $usersInGroup);
+				}
+			}
+
+			//check for public link shares
+			if (!$publicShare) {
+				$query = \OC_DB::prepare(
+					'SELECT share_with
+					FROM
+					`*PREFIX*share`
+					WHERE
+					item_source = ? AND share_type = ?'
+				);
+
+				$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+
+				if (\OCP\DB::isError($result)) {
+					\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+				} else {
+					if ($result->fetchRow()) {
+						$publicShare = true;
+					}
+				}
+			}
+			
+			// let's get the parent for the next round
+			$meta = $cache->get((int)$source);
+			if($meta !== false) {
+				$source = (int)$meta['parent'];
+			} else {
+				$source = -1;
+			}
+		}
+		// Include owner in list of users, if requested
+		if ($includeOwner) {
+			$shares[] = $user;
+		}
+
+		return array("users" => array_unique($shares), "public" => $publicShare);
+	}
 
 	/**
 	* @brief Get the items of item type shared with the current user
@@ -132,7 +251,7 @@ class Share {
 		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
 			$parameters, 1, $includeCollections);
 	}
-
+	
 	/**
 	* @brief Get the item of item type shared with the current user by source
 	* @param string Item type
@@ -409,8 +528,16 @@ class Share {
 				'fileSource' => $item['file_source'],
 				'shareType' => $shareType,
 				'shareWith' => $shareWith,
+				'itemParent' => $item['parent'],
 			));
 			self::delete($item['id']);
+			\OC_Hook::emit('OCP\Share', 'post_unshare', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'shareType' => $shareType,
+					'shareWith' => $shareWith,
+					'itemParent' => $item['parent'],
+			));
 			return true;
 		}
 		return false;
@@ -433,6 +560,11 @@ class Share {
 			foreach ($shares as $share) {
 				self::delete($share['id']);
 			}
+			\OC_Hook::emit('OCP\Share', 'post_unshareAll', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'shares' => $shares
+			));
 			return true;
 		}
 		return false;
@@ -875,7 +1007,10 @@ class Share {
 					$row['path'] = '/Shared/'.basename($row['path']);
 				} else {
 					if (!isset($mounts[$row['storage']])) {
-						$mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']);
+						$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
+						if (is_array($mountPoints)) {
+							$mounts[$row['storage']] = current($mountPoints);
+						}
 					}
 					if ($mounts[$row['storage']]) {
 						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
@@ -1086,6 +1221,17 @@ class Share {
 		if ($shareType == self::SHARE_TYPE_GROUP) {
 			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
 				$uidOwner, $suggestedItemTarget);
+			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $groupItemTarget,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith['group'],
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'token' => $token
+			));
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
@@ -1161,6 +1307,17 @@ class Share {
 		} else {
 			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
 				$suggestedItemTarget);
+			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $itemTarget,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith,
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'token' => $token
+			));
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
diff --git a/lib/request.php b/lib/request.php
index 9f74cf9beb585fc8ce16957e842c97377b2a3608..4d8380eb9ac49b85d1676fd057d18613d374e816 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -11,9 +11,10 @@ class OC_Request {
 	 * @brief Check overwrite condition
 	 * @returns true/false
 	 */
-	private static function isOverwriteCondition() {
+	private static function isOverwriteCondition($type = '') {
 		$regex = '/' . OC_Config::getValue('overwritecondaddr', '')  . '/';
-		return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1;
+		return $regex === '//' or preg_match($regex, $_SERVER['REMOTE_ADDR']) === 1
+			or ($type !== 'protocol' and OC_Config::getValue('forcessl', false));
 	}
 
 	/**
@@ -27,7 +28,7 @@ class OC_Request {
 		if(OC::$CLI) {
 			return 'localhost';
 		}
-		if(OC_Config::getValue('overwritehost', '')<>'' and self::isOverwriteCondition()) {
+		if(OC_Config::getValue('overwritehost', '') !== '' and self::isOverwriteCondition()) {
 			return OC_Config::getValue('overwritehost');
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -52,7 +53,7 @@ class OC_Request {
 	* Returns the server protocol. It respects reverse proxy servers and load balancers
 	*/
 	public static function serverProtocol() {
-		if(OC_Config::getValue('overwriteprotocol', '')<>'' and self::isOverwriteCondition()) {
+		if(OC_Config::getValue('overwriteprotocol', '') !== '' and self::isOverwriteCondition('protocol')) {
 			return OC_Config::getValue('overwriteprotocol');
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
@@ -76,7 +77,7 @@ class OC_Request {
 	 */
 	public static function requestUri() {
 		$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
-		if (OC_Config::getValue('overwritewebroot', '') <> '' and self::isOverwriteCondition()) {
+		if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) {
 			$uri = self::scriptName() . substr($uri, strlen($_SERVER['SCRIPT_NAME']));
 		}
 		return $uri;
@@ -91,7 +92,7 @@ class OC_Request {
 	 */
 	public static function scriptName() {
 		$name = $_SERVER['SCRIPT_NAME'];
-		if (OC_Config::getValue('overwritewebroot', '') <> '' and self::isOverwriteCondition()) {
+		if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) {
 			$serverroot = str_replace("\\", '/', substr(__DIR__, 0, -4));
 			$suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot)));
 			$name = OC_Config::getValue('overwritewebroot', '') . $suburi;
diff --git a/lib/session/internal.php b/lib/session/internal.php
new file mode 100644
index 0000000000000000000000000000000000000000..60aecccc8aac255ec08fb7f83cf4b572160c6fe9
--- /dev/null
+++ b/lib/session/internal.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Session;
+
+/**
+ * Class Internal
+ *
+ * wrap php's internal session handling into the Session interface
+ *
+ * @package OC\Session
+ */
+class Internal extends Memory {
+	public function __construct($name) {
+		session_name($name);
+		session_start();
+		if (!isset($_SESSION)) {
+			throw new \Exception('Failed to start session');
+		}
+		$this->data = $_SESSION;
+	}
+
+	public function __destruct() {
+		$_SESSION = $this->data;
+		session_write_close();
+	}
+
+	public function clear() {
+		session_unset();
+		@session_regenerate_id(true);
+		@session_start();
+		$this->data = $_SESSION = array();
+	}
+}
diff --git a/lib/session/memory.php b/lib/session/memory.php
new file mode 100644
index 0000000000000000000000000000000000000000..c148ff4b9b9928af848b7895e9132ce02ea73bd0
--- /dev/null
+++ b/lib/session/memory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Session;
+
+/**
+ * Class Internal
+ *
+ * store session data in an in-memory array, not persistance
+ *
+ * @package OC\Session
+ */
+class Memory extends Session {
+	protected $data;
+
+	public function __construct($name) {
+		//no need to use $name since all data is already scoped to this instance
+		$this->data = array();
+	}
+
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function set($key, $value) {
+		$this->data[$key] = $value;
+	}
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function get($key) {
+		if (!$this->exists($key)) {
+			return null;
+		}
+		return $this->data[$key];
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	public function exists($key) {
+		return isset($this->data[$key]);
+	}
+
+	/**
+	 * @param string $key
+	 */
+	public function remove($key) {
+		unset($this->data[$key]);
+	}
+
+	public function clear() {
+		$this->data = array();
+	}
+}
diff --git a/lib/session/session.php b/lib/session/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..55515f57a87d186adb11c407655b50f943350eda
--- /dev/null
+++ b/lib/session/session.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Session;
+
+abstract class Session implements \ArrayAccess {
+	/**
+	 * $name serves as a namespace for the session keys
+	 *
+	 * @param string $name
+	 */
+	abstract public function __construct($name);
+
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	abstract public function set($key, $value);
+
+	/**
+	 * @param string $key
+	 * @return mixed should return null if $key does not exist
+	 */
+	abstract public function get($key);
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	abstract public function exists($key);
+
+	/**
+	 * should not throw any errors if $key does not exist
+	 *
+	 * @param string $key
+	 */
+	abstract public function remove($key);
+
+	/**
+	 * removes all entries within the cache namespace
+	 */
+	abstract public function clear();
+
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset) {
+		return $this->exists($offset);
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @return mixed
+	 */
+	public function offsetGet($offset) {
+		return $this->get($offset);
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet($offset, $value) {
+		$this->set($offset, $value);
+	}
+
+	/**
+	 * @param mixed $offset
+	 */
+	public function offsetUnset($offset) {
+		$this->remove($offset);
+	}
+}
diff --git a/lib/setup.php b/lib/setup.php
index 7082f0b2afd4dc19e9596ed3694b1c22a0e10c92..a63cc664dbcabebb7ed0ec3fb18e4e3956228700 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -37,7 +37,7 @@ class OC_Setup {
 			$error[] = $l->t('Set an admin password.');
 		}
 		if(empty($options['directory'])) {
-			$error[] = $l->t('Specify a data folder.');
+			$options['directory'] = OC::$SERVERROOT."/data";
 		}
 
 		if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options
@@ -152,8 +152,12 @@ class OC_Setup {
 					self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username);
 				} catch (Exception $e) {
 					$error[] = array(
-						'error' => $l->t('Oracle username and/or password not valid'),
-						'hint' => $l->t('You need to enter either an existing account or the administrator.')
+						'error' => $l->t('Oracle connection could not be established'),
+						'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+							.' ORACLE_SID='.getenv('ORACLE_SID')
+							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+							.' NLS_LANG='.getenv('NLS_LANG')
+							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'
 					);
 					return $error;
 				}
@@ -187,6 +191,7 @@ class OC_Setup {
 					unlink("$datadir/owncloud.db");
 				}
 				//in case of sqlite, we can always fill the database
+				error_log("creating sqlite db");
 				OC_DB::createDbFromStructure('db_structure.xml');
 			}
 
@@ -195,7 +200,7 @@ class OC_Setup {
 				OC_User::createUser($username, $password);
 			}
 			catch(Exception $exception) {
-				$error[] = $exception->getMessage();
+				$error[] = 'Error while trying to create admin user: ' . $exception->getMessage();
 			}
 
 			if(count($error) == 0) {
@@ -451,9 +456,13 @@ class OC_Setup {
 		} else {
 			$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
 		}
+		\OC_Log::write('setup oracle', 'connect string: ' . $easy_connect_string, \OC_Log::DEBUG);
 		$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
 		if(!$connection) {
 			$e = oci_error();
+			if (is_array ($e) && isset ($e['message'])) {
+				throw new Exception($e['message']);
+			}
 			throw new Exception($l->t('Oracle username and/or password not valid'));
 		}
 		//check for roles creation rights in oracle
@@ -810,6 +819,7 @@ class OC_Setup {
 		$content.= "php_value upload_max_filesize 512M\n";//upload limit
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "php_value memory_limit 512M\n";
+		$content.= "php_value mbstring.func_overload 0\n";
 		$content.= "<IfModule env_module>\n";
 		$content.= "  SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
@@ -827,6 +837,10 @@ class OC_Setup {
 		$content.= "AddType image/svg+xml svg svgz\n";
 		$content.= "AddEncoding gzip svgz\n";
 		$content.= "</IfModule>\n";
+		$content.= "<IfModule dir_module>\n";
+		$content.= "DirectoryIndex index.php index.html\n";
+		$content.= "</IfModule>\n";
+		$content.= "AddDefaultCharset utf-8\n";
 		$content.= "Options -Indexes\n";
 		@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
 
diff --git a/lib/template.php b/lib/template.php
index 434c1e9e9901b7dc729773956e6f7bc7a7c8e46b..9467dedb62aac43c34f31480cb6efac051771232 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -186,10 +186,15 @@ class OC_Template{
 		$this->l10n = OC_L10N::get($parts[0]);
 
 		// Some headers to enhance security
-		header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
 		header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
 		header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
 
+		// iFrame Restriction Policy
+		$xFramePolicy = OC_Config::getValue('xframe_restriction', true);
+		if($xFramePolicy) {
+			header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
+		}
+		
 		// Content Security Policy
 		// If you change the standard policy, please also change it in config.sample.php
 		$policy = OC_Config::getValue('custom_csp_policy',
@@ -198,7 +203,8 @@ class OC_Template{
 			.'style-src \'self\' \'unsafe-inline\'; '
 			.'frame-src *; '
 			.'img-src *; '
-			.'font-src \'self\' data:');
+			.'font-src \'self\' data:; '
+			.'media-src *');
 		header('Content-Security-Policy:'.$policy); // Standard
 
 		$this->findTemplate($name);
@@ -240,14 +246,14 @@ class OC_Template{
 		// if the formfactor is not yet autodetected do the
 		// autodetection now. For possible formfactors check the
 		// detectFormfactor documentation
-		if(!isset($_SESSION['formfactor'])) {
-			$_SESSION['formfactor'] = self::detectFormfactor();
+		if (!\OC::$session->exists('formfactor')) {
+			\OC::$session->set('formfactor', self::detectFormfactor());
 		}
 		// allow manual override via GET parameter
 		if(isset($_GET['formfactor'])) {
-			$_SESSION['formfactor']=$_GET['formfactor'];
+			\OC::$session->set('formfactor', $_GET['formfactor']);
 		}
-		$formfactor=$_SESSION['formfactor'];
+		$formfactor = \OC::$session->get('formfactor');
 		if($formfactor=='default') {
 			$fext='';
 		}elseif($formfactor=='mobile') {
@@ -272,7 +278,7 @@ class OC_Template{
 	protected function findTemplate($name)
 	{
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( "theme" );
+		$theme = OC_Util::getTheme();
 
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 730942322306d8fa200d86b6b11d6272ceaefba2..7115b8f03063092de620bf3646a72c7abde0ac8b 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -18,6 +18,20 @@ class OC_TemplateLayout extends OC_Template {
 				$this->assign('bodyid', 'body-user');
 			}
 
+			// Update notification
+			if(OC_Config::getValue('updatechecker', true) === true) {
+				$data=OC_Updater::check();
+				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
+					$this->assign('updateAvailable', true);
+					$this->assign('updateVersion', $data['versionstring']);
+					$this->assign('updateLink', $data['web']);
+				} else {
+					$this->assign('updateAvailable', false); // No update available or not an admin user
+				}
+			} else {
+				$this->assign('updateAvailable', false); // Update check is disabled
+			}
+
 			// Add navigation entry
 			$this->assign( 'application', '', false );
 			$navigation = OC_App::getNavigation();
@@ -42,7 +56,7 @@ class OC_TemplateLayout extends OC_Template {
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
 		if (OC_Config::getValue('installed', false) && $renderas!='error') {
-			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config'));
+			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
 		}
 		if (!empty(OC_Util::$core_scripts)) {
 			$this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter);
@@ -64,25 +78,8 @@ class OC_TemplateLayout extends OC_Template {
 			$root = $info[0];
 			$web = $info[1];
 			$file = $info[2];
-			$paths = explode('/', $file);
 
-			$in_root = false;
-			foreach(OC::$APPSROOTS as $app_root) {
-				if($root == $app_root['path']) {
-					$in_root = true;
-					break;
-				}
-			}
-
-			if($in_root ) {
-				$app = $paths[0];
-				unset($paths[0]);
-				$path = implode('/', $paths);
-				$this->append( 'cssfiles', OC_Helper::linkTo($app, $path) . $versionParameter);
-			}
-			else {
-				$this->append( 'cssfiles', $web.'/'.$file);
-			}
+			$this->append( 'cssfiles', $web.'/'.$file . $versionParameter);
 		}
 	}
 
@@ -103,7 +100,7 @@ class OC_TemplateLayout extends OC_Template {
 
 	static public function findStylesheetFiles($styles) {
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( 'theme' );
+		$theme = OC_Util::getTheme();
 
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
@@ -111,7 +108,8 @@ class OC_TemplateLayout extends OC_Template {
 		$files = array();
 		foreach($styles as $style) {
 			// is it in 3rdparty?
-			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
+			if(strpos($style, '3rdparty') === 0 &&
+				self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
 
 			// or in the owncloud root?
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "$style$fext.css" )) {
@@ -122,20 +120,15 @@ class OC_TemplateLayout extends OC_Template {
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "core/$style.css" )) {
 
 			}else{
-				$append = false;
-				// or in apps?
-				foreach( OC::$APPSROOTS as $apps_dir)
-				{
-					if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) {
-						$append = true;
-						break;
-					}
-					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) {
-						$append = true;
-						break;
-					}
+				$app = substr($style, 0, strpos($style, '/'));
+				$style = substr($style, strpos($style, '/')+1);
+				$app_path = OC_App::getAppPath($app);
+				$app_url = OC::$WEBROOT . '/index.php/apps/' . $app;
+				if(self::appendIfExist($files, $app_path, $app_url, "$style$fext.css")) {
 				}
-				if(! $append) {
+				elseif(self::appendIfExist($files, $app_path, $app_url, "$style.css")) {
+				}
+				else {
 					echo('css file not found: style:'.$style.' formfactor:'.$fext
 						.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();
@@ -161,7 +154,7 @@ class OC_TemplateLayout extends OC_Template {
 
 	static public function findJavascriptFiles($scripts) {
 		// Read the selected theme from the config file
-		$theme=OC_Config::getValue( 'theme' );
+		$theme = OC_Util::getTheme();
 
 		// Read the detected formfactor and use the right file name.
 		$fext = self::getFormFactorExtension();
@@ -169,7 +162,8 @@ class OC_TemplateLayout extends OC_Template {
 		$files = array();
 		foreach($scripts as $script) {
 			// Is it in 3rd party?
-			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
+			if(strpos($script, '3rdparty') === 0 &&
+				self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
 
 			// Is it in apps and overwritten by the theme?
 			}elseif(self::appendIfExist($files, OC::$SERVERROOT, OC::$WEBROOT, "themes/$theme/apps/$script$fext.js" )) {
@@ -193,18 +187,15 @@ class OC_TemplateLayout extends OC_Template {
 
 			}else{
 				// Is it part of an app?
-				$append = false;
-				foreach( OC::$APPSROOTS as $apps_dir) {
-					if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) {
-						$append = true;
-						break;
-					}
-					elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) {
-						$append = true;
-						break;
-					}
+				$app = substr($script, 0, strpos($script, '/'));
+				$script = substr($script, strpos($script, '/')+1);
+				$app_path = OC_App::getAppPath($app);
+				$app_url = OC_App::getAppWebPath($app);
+				if(self::appendIfExist($files, $app_path, $app_url, "$script$fext.js")) {
+				}
+				elseif(self::appendIfExist($files, $app_path, $app_url, "$script.js")) {
 				}
-				if(! $append) {
+				else {
 					echo('js file not found: script:'.$script.' formfactor:'.$fext
 						.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();
diff --git a/lib/updater.php b/lib/updater.php
index e7d33ac2bb970c5ac240850594057982f5357bea..9081bfc4be80be4310acc7103b049a7045df90f8 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -29,7 +29,14 @@ class OC_Updater{
 	 * Check if a new version is available
 	 */
 	public static function check() {
-		OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
+
+		// Look up the cache - it is invalidated all 30 minutes
+		if((OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
+			return json_decode(OC_Appconfig::getValue('core', 'lastupdateResult'), true);
+		}
+
+		OC_Appconfig::setValue('core', 'lastupdatedat', time());
+
 		if(OC_Appconfig::getValue('core', 'installedat', '')=='') {
 			OC_Appconfig::setValue('core', 'installedat', microtime(true));
 		}
@@ -65,38 +72,9 @@ class OC_Updater{
 		$tmp['url'] = $data->url;
 		$tmp['web'] = $data->web;
 
-		return $tmp;
-	}
-
-	public static function ShowUpdatingHint() {
-		$l = OC_L10N::get('lib');
-
-		if(OC_Config::getValue('updatechecker', true)==true) {
-			$data=OC_Updater::check();
-			if(isset($data['version']) and $data['version']<>'') {
-				$txt='<span style="color:#AA0000; font-weight:bold;">'
-					.$l->t('%s is available. Get <a href="%s">more information</a>',
-					array($data['versionstring'], $data['web'])).'</span>';
-			}else{
-				$txt=$l->t('up to date');
-			}
-		}else{
-			$txt=$l->t('updates check is disabled');
-		}
-		return($txt);
-	}
-
-
-	/**
-	 * do ownCloud update
-	 */
-	public static function doUpdate() {
-
-		//update ownCloud core
-
-		//update all apps
-
-		//update version in config
+		// Cache the result
+		OC_Appconfig::setValue('core', 'lastupdateResult', json_encode($data));
 
+		return $tmp;
 	}
-}
+}
\ No newline at end of file
diff --git a/lib/user.php b/lib/user.php
index b19af940795b64087852be8ea7bda0f2f494f390..503ac3f749327eea5328a34551e8940a5b9fc62e 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -30,35 +30,85 @@
  *   post_createUser(uid, password)
  *   pre_deleteUser(&run, uid)
  *   post_deleteUser(uid)
- *   pre_setPassword(&run, uid, password)
- *   post_setPassword(uid, password)
- *   pre_login(&run, uid)
+ *   pre_setPassword(&run, uid, password, recoveryPassword)
+ *   post_setPassword(uid, password, recoveryPassword)
+ *   pre_login(&run, uid, password)
  *   post_login(uid)
  *   logout()
  */
 class OC_User {
-	// The backend used for user management
-	private static $_usedBackends = array();
+	public static $userSession = null;
+
+	private static function getUserSession() {
+		if (!self::$userSession) {
+			$manager = new \OC\User\Manager();
+			self::$userSession = new \OC\User\Session($manager, \OC::$session);
+			self::$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
+			});
+			self::$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+				/** @var $user \OC\User\User */
+				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
+			});
+			self::$userSession->listen('\OC\User', 'preDelete', function ($user) {
+				/** @var $user \OC\User\User */
+				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+			});
+			self::$userSession->listen('\OC\User', 'postDelete', function ($user) {
+				/** @var $user \OC\User\User */
+				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
+			});
+			self::$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+				/** @var $user \OC\User\User */
+				OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+			});
+			self::$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+				/** @var $user \OC\User\User */
+				OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+			});
+			self::$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
+			});
+			self::$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+				/** @var $user \OC\User\User */
+				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+			});
+			self::$userSession->listen('\OC\User', 'logout', function () {
+				\OC_Hook::emit('OC_User', 'logout', array());
+			});
+		}
+		return self::$userSession;
+	}
 
-	private static $_setupedBackends = array();
+	/**
+	 * @return \OC\User\Manager
+	 */
+	private static function getManager() {
+		return self::getUserSession()->getManager();
+	}
 
-	// Backends available (except database)
 	private static $_backends = array();
 
+	private static $_usedBackends = array();
+
+	private static $_setupedBackends = array();
+
 	/**
 	 * @brief registers backend
-	 * @param $name name of the backend
-	 * @returns true/false
+	 * @param string $backend name of the backend
+	 * @deprecated Add classes by calling useBackend with a class instance instead
+	 * @return bool
 	 *
 	 * Makes a list of backends that can be used by other modules
 	 */
-	public static function registerBackend( $backend ) {
+	public static function registerBackend($backend) {
 		self::$_backends[] = $backend;
 		return true;
 	}
 
 	/**
 	 * @brief gets available backends
+	 * @deprecated
 	 * @returns array of backends
 	 *
 	 * Returns the names of all backends.
@@ -69,6 +119,7 @@ class OC_User {
 
 	/**
 	 * @brief gets used backends
+	 * @deprecated
 	 * @returns array of backends
 	 *
 	 * Returns the names of all used backends.
@@ -79,33 +130,36 @@ class OC_User {
 
 	/**
 	 * @brief Adds the backend to the list of used backends
-	 * @param $backend default: database The backend to use for user managment
-	 * @returns true/false
+	 * @param string | OC_User_Backend $backend default: database The backend to use for user management
+	 * @return bool
 	 *
 	 * Set the User Authentication Module
 	 */
-	public static function useBackend( $backend = 'database' ) {
-		if($backend instanceof OC_User_Interface) {
-			OC_Log::write('core', 'Adding user backend instance of '.get_class($backend).'.', OC_Log::DEBUG);
-			self::$_usedBackends[get_class($backend)]=$backend;
+	public static function useBackend($backend = 'database') {
+		if ($backend instanceof OC_User_Interface) {
+			OC_Log::write('core', 'Adding user backend instance of ' . get_class($backend) . '.', OC_Log::DEBUG);
+			self::$_usedBackends[get_class($backend)] = $backend;
+			self::getManager()->registerBackend($backend);
 		} else {
 			// You'll never know what happens
-			if( null === $backend OR !is_string( $backend )) {
+			if (null === $backend OR !is_string($backend)) {
 				$backend = 'database';
 			}
 
 			// Load backend
-			switch( $backend ) {
+			switch ($backend) {
 				case 'database':
 				case 'mysql':
 				case 'sqlite':
-					OC_Log::write('core', 'Adding user backend '.$backend.'.', OC_Log::DEBUG);
+					OC_Log::write('core', 'Adding user backend ' . $backend . '.', OC_Log::DEBUG);
 					self::$_usedBackends[$backend] = new OC_User_Database();
+					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 				default:
-					OC_Log::write('core', 'Adding default user backend '.$backend.'.', OC_Log::DEBUG);
+					OC_Log::write('core', 'Adding default user backend ' . $backend . '.', OC_Log::DEBUG);
 					$className = 'OC_USER_' . strToUpper($backend);
 					self::$_usedBackends[$backend] = new $className();
+					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 			}
 		}
@@ -116,121 +170,73 @@ class OC_User {
 	 * remove all used backends
 	 */
 	public static function clearBackends() {
-		self::$_usedBackends=array();
+		self::$_usedBackends = array();
+		self::getManager()->clearBackends();
 	}
 
 	/**
 	 * setup the configured backends in config.php
 	 */
 	public static function setupBackends() {
-		$backends=OC_Config::getValue('user_backends', array());
-		foreach($backends as $i=>$config) {
-			$class=$config['class'];
-			$arguments=$config['arguments'];
-			if(class_exists($class)) {
-				if(array_search($i, self::$_setupedBackends)===false) {
+		$backends = OC_Config::getValue('user_backends', array());
+		foreach ($backends as $i => $config) {
+			$class = $config['class'];
+			$arguments = $config['arguments'];
+			if (class_exists($class)) {
+				if (array_search($i, self::$_setupedBackends) === false) {
 					// make a reflection object
 					$reflectionObj = new ReflectionClass($class);
 
 					// use Reflection to create a new instance, using the $args
 					$backend = $reflectionObj->newInstanceArgs($arguments);
 					self::useBackend($backend);
-					$_setupedBackends[]=$i;
+					$_setupedBackends[] = $i;
 				} else {
-					OC_Log::write('core', 'User backend '.$class.' already initialized.', OC_Log::DEBUG);
+					OC_Log::write('core', 'User backend ' . $class . ' already initialized.', OC_Log::DEBUG);
 				}
 			} else {
-				OC_Log::write('core', 'User backend '.$class.' not found.', OC_Log::ERROR);
+				OC_Log::write('core', 'User backend ' . $class . ' not found.', OC_Log::ERROR);
 			}
 		}
 	}
 
 	/**
 	 * @brief Create a new user
-	 * @param $uid The username of the user to create
-	 * @param $password The password of the new user
-	 * @returns true/false
+	 * @param string $uid The username of the user to create
+	 * @param string $password The password of the new user
+	 * @throws Exception
+	 * @return bool true/false
 	 *
 	 * Creates a new user. Basic checking of username is done in OC_User
 	 * itself, not in its subclasses.
 	 *
 	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
 	 */
-	public static function createUser( $uid, $password ) {
-		// Check the name for bad characters
-		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
-		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )) {
-			throw new Exception('Only the following characters are allowed in a username:'
-				.' "a-z", "A-Z", "0-9", and "_.@-"');
-		}
-		// No empty username
-		if(trim($uid) == '') {
-			throw new Exception('A valid username must be provided');
-		}
-		// No empty password
-		if(trim($password) == '') {
-			throw new Exception('A valid password must be provided');
-		}
-
-		// Check if user already exists
-		if( self::userExistsForCreation($uid) ) {
-			throw new Exception('The username is already being used');
-		}
-
-
-		$run = true;
-		OC_Hook::emit( "OC_User", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password ));
-
-		if( $run ) {
-			//create the user in the first backend that supports creating users
-			foreach(self::$_usedBackends as $backend) {
-				if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER))
-					continue;
-
-				$backend->createUser($uid, $password);
-				OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password ));
-
-				return self::userExists($uid);
-			}
-		}
-		return false;
+	public static function createUser($uid, $password) {
+		self::getManager()->createUser($uid, $password);
 	}
 
 	/**
 	 * @brief delete a user
-	 * @param $uid The username of the user to delete
-	 * @returns true/false
+	 * @param string $uid The username of the user to delete
+	 * @return bool
 	 *
 	 * Deletes a user
 	 */
-	public static function deleteUser( $uid ) {
-		$run = true;
-		OC_Hook::emit( "OC_User", "pre_deleteUser", array( "run" => &$run, "uid" => $uid ));
-
-		if( $run ) {
-			//delete the user from all backends
-			foreach(self::$_usedBackends as $backend) {
-				$backend->deleteUser($uid);
-			}
-			if (self::userExists($uid)) {
-				return false;
-			}
+	public static function deleteUser($uid) {
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			$user->delete();
+
 			// We have to delete the user from all groups
-			foreach( OC_Group::getUserGroups( $uid ) as $i ) {
-				OC_Group::removeFromGroup( $uid, $i );
+			foreach (OC_Group::getUserGroups($uid) as $i) {
+				OC_Group::removeFromGroup($uid, $i);
 			}
 			// Delete the user's keys in preferences
 			OC_Preferences::deleteUser($uid);
 
 			// Delete user files in /data/
-			OC_Helper::rmdirr(OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/'.$uid.'/');
-
-			// Emit and exit
-			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
-			return true;
-		}
-		else{
-			return false;
+			OC_Helper::rmdirr(OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid . '/');
 		}
 	}
 
@@ -238,75 +244,34 @@ class OC_User {
 	 * @brief Try to login a user
 	 * @param $uid The username of the user to log in
 	 * @param $password The password of the user
-	 * @returns true/false
+	 * @return bool
 	 *
 	 * Log in a user and regenerate a new session - if the password is ok
 	 */
-	public static function login( $uid, $password ) {
-		$run = true;
-		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
-
-		if( $run ) {
-			$uid = self::checkPassword( $uid, $password );
-			$enabled = self::isEnabled($uid);
-			if($uid && $enabled) {
-				session_regenerate_id(true);
-				self::setUserId($uid);
-				self::setDisplayName($uid);
-				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
-				return true;
-			}
-		}
-		return false;
+	public static function login($uid, $password) {
+		return self::getUserSession()->login($uid, $password);
 	}
 
 	/**
 	 * @brief Sets user id for session and triggers emit
 	 */
 	public static function setUserId($uid) {
-		$_SESSION['user_id'] = $uid;
+		OC::$session->set('user_id', $uid);
 	}
 
 	/**
 	 * @brief Sets user display name for session
 	 */
 	public static function setDisplayName($uid, $displayName = null) {
-		$result = false;
-		if ($displayName ) {
-			foreach(self::$_usedBackends as $backend) {
-				if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {
-					if($backend->userExists($uid)) {
-						$result |= $backend->setDisplayName($uid, $displayName);
-					}
-				}
-			}
-		} else {
-			$displayName = self::determineDisplayName($uid);
-			$result = true;
+		if (is_null($displayName)) {
+			$displayName = $uid;
 		}
-		if (OC_User::getUser() === $uid) {
-			$_SESSION['display_name'] = $displayName;
-		}
-		return $result;
-	}
-
-
-	/**
-	 * @brief get display name
-	 * @param $uid The username
-	 * @returns string display name or uid if no display name is defined
-	 *
-	 */
-	private static function determineDisplayName( $uid ) {
-		foreach(self::$_usedBackends as $backend) {
-			if($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
-				$result=$backend->getDisplayName( $uid );
-				if($result) {
-					return $result;
-				}
-			}
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			return $user->setDisplayName($displayName);
+		} else {
+			return false;
 		}
-		return $uid;
 	}
 
 	/**
@@ -315,36 +280,31 @@ class OC_User {
 	 * Logout, destroys session
 	 */
 	public static function logout() {
-		OC_Hook::emit( "OC_User", "logout", array());
-		session_unset();
-		session_destroy();
-		OC_User::unsetMagicInCookie();
+		self::getUserSession()->logout();
 	}
 
 	/**
 	 * @brief Check if the user is logged in
-	 * @returns true/false
+	 * @returns bool
 	 *
 	 * Checks if the user is logged in
 	 */
 	public static function isLoggedIn() {
-		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
+		if (\OC::$session->get('user_id')) {
 			OC_App::loadApps(array('authentication'));
 			self::setupBackends();
-			if (self::userExists($_SESSION['user_id']) ) {
-				return true;
-			}
+			return self::userExists(\OC::$session->get('user_id'));
 		}
 		return false;
 	}
 
 	/**
 	 * @brief Check if the user is an admin user
-	 * @param $uid uid of the admin
-	 * @returns bool
+	 * @param string $uid uid of the admin
+	 * @return bool
 	 */
 	public static function isAdminUser($uid) {
-		if(OC_Group::inGroup($uid, 'admin' )) {
+		if (OC_Group::inGroup($uid, 'admin')) {
 			return true;
 		}
 		return false;
@@ -356,32 +316,40 @@ class OC_User {
 	 * @return string uid or false
 	 */
 	public static function getUser() {
-		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ) {
-			return $_SESSION['user_id'];
-		}
-		else{
+		$uid = OC::$session->get('user_id');
+		if (!is_null($uid)) {
+			return $uid;
+		} else {
 			return false;
 		}
 	}
 
 	/**
 	 * @brief get the display name of the user currently logged in.
+	 * @param string $uid
 	 * @return string uid or false
 	 */
-	public static function getDisplayName($user=null) {
-		if ( $user ) {
-			return self::determineDisplayName($user);
-		} else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
-			return $_SESSION['display_name'];
-		}
-		else{
-			return false;
+	public static function getDisplayName($uid = null) {
+		if ($uid) {
+			$user = self::getManager()->get($uid);
+			if ($user) {
+				return $user->getDisplayName();
+			} else {
+				return $uid;
+			}
+		} else {
+			$user = self::getUserSession()->getUser();
+			if ($user) {
+				return $user->getDisplayName();
+			} else {
+				return false;
+			}
 		}
 	}
 
 	/**
 	 * @brief Autogenerate a password
-	 * @returns string
+	 * @return string
 	 *
 	 * generates a password
 	 */
@@ -391,111 +359,89 @@ class OC_User {
 
 	/**
 	 * @brief Set password
-	 * @param $uid The username
-	 * @param $password The new password
-	 * @returns true/false
+	 * @param string $uid The username
+	 * @param string $password The new password
+	 * @param string $recoveryPassword for the encryption app to reset encryption keys
+	 * @return bool
 	 *
 	 * Change the password of a user
 	 */
-	public static function setPassword( $uid, $password ) {
-		$run = true;
-		OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
-
-		if( $run ) {
-			$success = false;
-			foreach(self::$_usedBackends as $backend) {
-				if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) {
-					if($backend->userExists($uid)) {
-						$success |= $backend->setPassword($uid, $password);
-					}
-				}
-			}
-			// invalidate all login cookies
-			OC_Preferences::deleteApp($uid, 'login_token');
-			OC_Hook::emit( "OC_User", "post_setPassword", array( "uid" => $uid, "password" => $password ));
-			return $success;
-		}
-		else{
+	public static function setPassword($uid, $password, $recoveryPassword = null) {
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			return $user->setPassword($password, $recoveryPassword);
+		} else {
 			return false;
 		}
 	}
 
 	/**
 	 * @brief Check whether user can change his password
-	 * @param $uid The username
-	 * @returns true/false
+	 * @param string $uid The username
+	 * @return bool
 	 *
 	 * Check whether a specified user can change his password
 	 */
 	public static function canUserChangePassword($uid) {
-		foreach(self::$_usedBackends as $backend) {
-			if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) {
-				if($backend->userExists($uid)) {
-					return true;
-				}
-			}
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			return $user->canChangePassword();
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	/**
 	 * @brief Check whether user can change his display name
-	 * @param $uid The username
-	 * @returns true/false
+	 * @param string $uid The username
+	 * @return bool
 	 *
 	 * Check whether a specified user can change his display name
 	 */
 	public static function canUserChangeDisplayName($uid) {
-		if (OC_Config::getValue('allow_user_to_change_display_name', true)) {
-			foreach(self::$_usedBackends as $backend) {
-				if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {
-					if($backend->userExists($uid)) {
-						return true;
-					}
-				}
-			}
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			return $user->canChangeDisplayName();
+		} else {
+			return false;
 		}
-		return false;
 	}
 
 	/**
 	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
-	 * @returns string
+	 * @param string $uid The username
+	 * @param string $password The password
+	 * @return bool
 	 *
 	 * Check if the password is correct without logging in the user
 	 * returns the user id or false
 	 */
-	public static function checkPassword( $uid, $password ) {
-		foreach(self::$_usedBackends as $backend) {
-			if($backend->implementsActions(OC_USER_BACKEND_CHECK_PASSWORD)) {
-				$result=$backend->checkPassword( $uid, $password );
-				if($result) {
-					return $result;
-				}
+	public static function checkPassword($uid, $password) {
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			if ($user->checkPassword($password)) {
+				return $user->getUID();
+			} else {
+				return false;
 			}
+		} else {
+			return false;
 		}
 	}
 
 	/**
-	 * @brief Check if the password is correct
 	 * @param string $uid The username
-	 * @param string $password The password
-	 * @returns string
+	 * @return string
 	 *
 	 * returns the path to the users home directory
 	 */
 	public static function getHome($uid) {
-		foreach(self::$_usedBackends as $backend) {
-			if($backend->implementsActions(OC_USER_BACKEND_GET_HOME) && $backend->userExists($uid)) {
-				$result=$backend->getHome($uid);
-				if($result) {
-					return $result;
-				}
-			}
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			return $user->getHome();
+		} else {
+			return OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
 		}
-		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 	}
 
 	/**
@@ -505,148 +451,93 @@ class OC_User {
 	 * Get a list of all users.
 	 */
 	public static function getUsers($search = '', $limit = null, $offset = null) {
-		$users = array();
-		foreach (self::$_usedBackends as $backend) {
-			$backendUsers = $backend->getUsers($search, $limit, $offset);
-			if (is_array($backendUsers)) {
-				$users = array_merge($users, $backendUsers);
-			}
+		$users = self::getManager()->search($search, $limit, $offset);
+		$uids = array();
+		foreach ($users as $user) {
+			$uids[] = $user->getUID();
 		}
-		asort($users);
-		return $users;
+		return $uids;
 	}
 
 	/**
 	 * @brief Get a list of all users display name
-	 * @returns associative array with all display names (value) and corresponding uids (key)
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array associative array with all display names (value) and corresponding uids (key)
 	 *
 	 * Get a list of all display names and user ids.
 	 */
 	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
 		$displayNames = array();
-		foreach (self::$_usedBackends as $backend) {
-			$backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
-			if (is_array($backendDisplayNames)) {
-				$displayNames = array_merge($displayNames, $backendDisplayNames);
-			}
+		$users = self::getManager()->searchDisplayName($search, $limit, $offset);
+		foreach ($users as $user) {
+			$displayNames[$user->getUID()] = $user->getDisplayName();
 		}
-		asort($displayNames);
 		return $displayNames;
 	}
 
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
-	 * @param string $excludingBackend (default none)
 	 * @return boolean
 	 */
-	public static function userExists($uid, $excludingBackend=null) {
-		foreach(self::$_usedBackends as $backend) {
-			if (!is_null($excludingBackend) && !strcmp(get_class($backend), $excludingBackend)) {
-				OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
-				continue;
-			}
-			$result=$backend->userExists($uid);
-			if($result===true) {
-				return true;
-			}
-		}
-		return false;
+	public static function userExists($uid) {
+		return self::getManager()->userExists($uid);
 	}
 
-    public static function userExistsForCreation($uid) {
-        foreach(self::$_usedBackends as $backend) {
-            if(!$backend->hasUserListings())
-                continue;
-
-            $result=$backend->userExists($uid);
-            if($result===true) {
-                return true;
-            }
-        }
-        return false;
-    }
-
 	/**
 	 * disables a user
-	 * @param string $userid the user to disable
+	 *
+	 * @param string $uid the user to disable
 	 */
-	public static function disableUser($userid) {
-		$sql = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
-		$stmt = OC_DB::prepare($sql);
-		if ( ! OC_DB::isError($stmt) ) {
-			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
-			if ( OC_DB::isError($result) ) {
-				OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
-			}
-		} else {
-			OC_Log::write('OC_User', 'could not disable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+	public static function disableUser($uid) {
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			$user->setEnabled(false);
 		}
 	}
 
 	/**
 	 * enable a user
-	 * @param string $userid
+	 *
+	 * @param string $uid
 	 */
-	public static function enableUser($userid) {
-		$sql = 'DELETE FROM `*PREFIX*preferences`'
-			." WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
-		$stmt = OC_DB::prepare($sql);
-		if ( ! OC_DB::isError($stmt) ) {
-			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
-			if ( OC_DB::isError($result) ) {
-				OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
-			}
-		} else {
-			OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+	public static function enableUser($uid) {
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			$user->setEnabled(true);
 		}
 	}
 
 	/**
 	 * checks if a user is enabled
-	 * @param string $userid
+	 *
+	 * @param string $uid
 	 * @return bool
 	 */
-	public static function isEnabled($userid) {
-		$sql = 'SELECT `userid` FROM `*PREFIX*preferences`'
-			.' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?';
-		$stmt = OC_DB::prepare($sql);
-		if ( ! OC_DB::isError($stmt) ) {
-			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
-			if ( ! OC_DB::isError($result) ) {
-				return $result->numRows() ? false : true;
-			} else {
-				OC_Log::write('OC_User',
-					'could not check if enabled: '. OC_DB::getErrorMessage($result),
-					OC_Log::ERROR);
-			}
+	public static function isEnabled($uid) {
+		$user = self::getManager()->get($uid);
+		if ($user) {
+			return $user->isEnabled();
 		} else {
-			OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+			return false;
 		}
-		return false;
 	}
 
 	/**
 	 * @brief Set cookie value to use in next page load
 	 * @param string $username username to be set
+	 * @param string $token
 	 */
 	public static function setMagicInCookie($username, $token) {
-		$secure_cookie = OC_Config::getValue("forcessl", false);
-		$expires = time() + OC_Config::getValue('remember_login_cookie_lifetime', 60*60*24*15);
-		setcookie("oc_username", $username, $expires, OC::$WEBROOT, '', $secure_cookie);
-		setcookie("oc_token", $token, $expires, OC::$WEBROOT, '', $secure_cookie, true);
-		setcookie("oc_remember_login", true, $expires, OC::$WEBROOT, '', $secure_cookie);
+		self::getUserSession()->setMagicInCookie($username, $token);
 	}
 
 	/**
 	 * @brief Remove cookie for "remember username"
 	 */
 	public static function unsetMagicInCookie() {
-		unset($_COOKIE["oc_username"]);
-		unset($_COOKIE["oc_token"]);
-		unset($_COOKIE["oc_remember_login"]);
-		setcookie("oc_username", null, -1);
-		setcookie("oc_token", null, -1);
-		setcookie("oc_remember_login", null, -1);
+		self::getUserSession()->unsetMagicInCookie();
 	}
 }
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 93e8f17ca98ab460d2531dd35a3531b31cab6fbe..e9be08e429cb12b5ea06bfb0133fca668f37ac63 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -58,7 +58,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 
 	/**
 	* @brief Get all supported actions
-	* @returns bitwise-or'ed actions
+	* @return int bitwise-or'ed actions
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -76,8 +76,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
 
 	/**
 	* @brief Check if backend implements actions
-	* @param $actions bitwise-or'ed actions
-	* @returns boolean
+	* @param int $actions bitwise-or'ed actions
+	* @return boolean
 	*
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
@@ -87,12 +87,12 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	}
 
 	/**
-	* @brief delete a user
-	* @param $uid The username of the user to delete
-	* @returns true/false
-	*
-	* Deletes a user
-	*/
+	 * @brief delete a user
+	 * @param string $uid The username of the user to delete
+	 * @return bool
+	 *
+	 * Deletes a user
+	 */
 	public function deleteUser( $uid ) {
 		return false;
 	}
@@ -127,8 +127,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
 
 	/**
 	 * @brief get display name of the user
-	 * @param $uid user ID of the user
-	 * @return display name
+	 * @param string $uid user ID of the user
+	 * @return string display name
 	 */
 	public function getDisplayName($uid) {
 		return $uid;
diff --git a/lib/user/database.php b/lib/user/database.php
index 210c7f3e1eb28c38b0cd42164ae3c2371a0755ef..d70b620f2abf055d9fd102fd36930bdce474f16f 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -46,7 +46,7 @@ class OC_User_Database extends OC_User_Backend {
 
 	private function getHasher() {
 		if(!self::$hasher) {
-			//we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix
+			//we don't want to use DES based crypt(), since it doesn't return a hash with a recognisable prefix
 			$forcePortable=(CRYPT_BLOWFISH!=1);
 			self::$hasher=new PasswordHash(8, $forcePortable);
 		}
@@ -136,7 +136,7 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	public function getDisplayName($uid) {
 		if( $this->userExists($uid) ) {
-			$query = OC_DB::prepare( 'SELECT displayname FROM `*PREFIX*users` WHERE `uid` = ?' );
+			$query = OC_DB::prepare( 'SELECT `displayname` FROM `*PREFIX*users` WHERE `uid` = ?' );
 			$result = $query->execute( array( $uid ))->fetchAll();
 			$displayName = trim($result[0]['displayname'], ' ');
 			if ( !empty($displayName) ) {
@@ -237,13 +237,13 @@ class OC_User_Database extends OC_User_Backend {
 	 * @return boolean
 	 */
 	public function userExists($uid) {
-		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
+		$query = OC_DB::prepare( 'SELECT COUNT(*) FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid ));
 		if (OC_DB::isError($result)) {
 			OC_Log::write('core', OC_DB::getErrorMessage($result), OC_Log::ERROR);
 			return false;
 		}
-		return $result->numRows() > 0;
+		return $result->fetchOne() > 0;
 	}
 
 	/**
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index d63f60efbeb53c0a1adb61e6ce8c5df789672957..b5b7a6c3c7ac7b135cc5abc0520a7d2b4246f155 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -1,114 +1,118 @@
 <?php
 
 /**
-* ownCloud
-*
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Frank Karlitschek
+ * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 /**
  * dummy user backend, does not keep state, only for testing use
  */
 class OC_User_Dummy extends OC_User_Backend {
-	private $users=array();
+	private $users = array();
+
 	/**
-		* @brief Create a new user
-		* @param $uid The username of the user to create
-		* @param $password The password of the new user
-		* @returns true/false
-		*
-		* Creates a new user. Basic checking of username is done in OC_User
-		* itself, not in its subclasses.
-		*/
+	 * @brief Create a new user
+	 * @param string $uid The username of the user to create
+	 * @param string $password The password of the new user
+	 * @return bool
+	 *
+	 * Creates a new user. Basic checking of username is done in OC_User
+	 * itself, not in its subclasses.
+	 */
 	public function createUser($uid, $password) {
-		if(isset($this->users[$uid])) {
+		if (isset($this->users[$uid])) {
 			return false;
-		}else{
-			$this->users[$uid]=$password;
+		} else {
+			$this->users[$uid] = $password;
 			return true;
 		}
 	}
 
 	/**
-		* @brief delete a user
-		* @param $uid The username of the user to delete
-		* @returns true/false
-		*
-		* Deletes a user
-		*/
-	public function deleteUser( $uid ) {
-		if(isset($this->users[$uid])) {
+	 * @brief delete a user
+	 * @param string $uid The username of the user to delete
+	 * @return bool
+	 *
+	 * Deletes a user
+	 */
+	public function deleteUser($uid) {
+		if (isset($this->users[$uid])) {
 			unset($this->users[$uid]);
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 
 	/**
-		* @brief Set password
-		* @param $uid The username
-		* @param $password The new password
-		* @returns true/false
-		*
-		* Change the password of a user
-		*/
+	 * @brief Set password
+	 * @param string $uid The username
+	 * @param string $password The new password
+	 * @return bool
+	 *
+	 * Change the password of a user
+	 */
 	public function setPassword($uid, $password) {
-		if(isset($this->users[$uid])) {
-			$this->users[$uid]=$password;
+		if (isset($this->users[$uid])) {
+			$this->users[$uid] = $password;
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 
 	/**
-		* @brief Check if the password is correct
-		* @param $uid The username
-		* @param $password The password
-		* @returns string
-		*
-		* Check if the password is correct without logging in the user
-		* returns the user id or false
-		*/
+	 * @brief Check if the password is correct
+	 * @param string $uid The username
+	 * @param string $password The password
+	 * @return string
+	 *
+	 * Check if the password is correct without logging in the user
+	 * returns the user id or false
+	 */
 	public function checkPassword($uid, $password) {
-		if(isset($this->users[$uid])) {
-			return ($this->users[$uid]==$password);
-		}else{
+		if (isset($this->users[$uid])) {
+			return ($this->users[$uid] == $password);
+		} else {
 			return false;
 		}
 	}
 
 	/**
-		* @brief Get a list of all users
-		* @returns array with all uids
-		*
-		* Get a list of all users.
-		*/
+	 * @brief Get a list of all users
+	 * @param string $search
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array with all uids
+	 *
+	 * Get a list of all users.
+	 */
 	public function getUsers($search = '', $limit = null, $offset = null) {
 		return array_keys($this->users);
 	}
 
 	/**
-		* @brief check if a user exists
-		* @param string $uid the username
-		* @return boolean
-		*/
+	 * @brief check if a user exists
+	 * @param string $uid the username
+	 * @return boolean
+	 */
 	public function userExists($uid) {
 		return isset($this->users[$uid]);
 	}
diff --git a/lib/user/manager.php b/lib/user/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..d17cdf1a200790dcc815edfc1f231d1dcfd9e1d7
--- /dev/null
+++ b/lib/user/manager.php
@@ -0,0 +1,228 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\User;
+
+use OC\Hooks\PublicEmitter;
+
+/**
+ * Class Manager
+ *
+ * Hooks available in scope \OC\User:
+ * - preSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - postSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - preDelete(\OC\User\User $user)
+ * - postDelete(\OC\User\User $user)
+ * - preCreateUser(string $uid, string $password)
+ * - postCreateUser(\OC\User\User $user, string $password)
+ *
+ * @package OC\User
+ */
+class Manager extends PublicEmitter {
+	/**
+	 * @var \OC_User_Backend[] $backends
+	 */
+	private $backends = array();
+
+	private $cachedUsers = array();
+
+	public function __construct() {
+		$cachedUsers = $this->cachedUsers;
+		$this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
+			$i = array_search($user, $cachedUsers);
+			if ($i !== false) {
+				unset($cachedUsers[$i]);
+			}
+		});
+	}
+
+	/**
+	 * register a user backend
+	 *
+	 * @param \OC_User_Backend $backend
+	 */
+	public function registerBackend($backend) {
+		$this->backends[] = $backend;
+	}
+
+	/**
+	 * remove a user backend
+	 *
+	 * @param \OC_User_Backend $backend
+	 */
+	public function removeBackend($backend) {
+		$this->cachedUsers = array();
+		if (($i = array_search($backend, $this->backends)) !== false) {
+			unset($this->backends[$i]);
+		}
+	}
+
+	/**
+	 * remove all user backends
+	 */
+	public function clearBackends() {
+		$this->cachedUsers = array();
+		$this->backends = array();
+	}
+
+	/**
+	 * get a user by user id
+	 *
+	 * @param string $uid
+	 * @return \OC\User\User
+	 */
+	public function get($uid) {
+		if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
+			return $this->cachedUsers[$uid];
+		}
+		foreach ($this->backends as $backend) {
+			if ($backend->userExists($uid)) {
+				return $this->getUserObject($uid, $backend);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * get or construct the user object
+	 *
+	 * @param string $uid
+	 * @param \OC_User_Backend $backend
+	 * @return \OC\User\User
+	 */
+	protected function getUserObject($uid, $backend) {
+		if (isset($this->cachedUsers[$uid])) {
+			return $this->cachedUsers[$uid];
+		}
+		$this->cachedUsers[$uid] = new User($uid, $backend, $this);
+		return $this->cachedUsers[$uid];
+	}
+
+	/**
+	 * check if a user exists
+	 *
+	 * @param string $uid
+	 * @return bool
+	 */
+	public function userExists($uid) {
+		$user = $this->get($uid);
+		return ($user !== null);
+	}
+
+	/**
+	 * search by user id
+	 *
+	 * @param string $pattern
+	 * @param int $limit
+	 * @param int $offset
+	 * @return \OC\User\User[]
+	 */
+	public function search($pattern, $limit = null, $offset = null) {
+		$users = array();
+		foreach ($this->backends as $backend) {
+			$backendUsers = $backend->getUsers($pattern, $limit, $offset);
+			if (is_array($backendUsers)) {
+				foreach ($backendUsers as $uid) {
+					$users[] = $this->getUserObject($uid, $backend);
+					if (!is_null($limit)) {
+						$limit--;
+					}
+					if (!is_null($offset) and $offset > 0) {
+						$offset--;
+					}
+
+				}
+			}
+		}
+
+		usort($users, function ($a, $b) {
+			/**
+			 * @var \OC\User\User $a
+			 * @var \OC\User\User $b
+			 */
+			return strcmp($a->getUID(), $b->getUID());
+		});
+		return $users;
+	}
+
+	/**
+	 * search by displayName
+	 *
+	 * @param string $pattern
+	 * @param int $limit
+	 * @param int $offset
+	 * @return \OC\User\User[]
+	 */
+	public function searchDisplayName($pattern, $limit = null, $offset = null) {
+		$users = array();
+		foreach ($this->backends as $backend) {
+			$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+			if (is_array($backendUsers)) {
+				foreach ($backendUsers as $uid => $displayName) {
+					$users[] = $this->getUserObject($uid, $backend);
+					if (!is_null($limit)) {
+						$limit--;
+					}
+					if (!is_null($offset) and $offset > 0) {
+						$offset--;
+					}
+
+				}
+			}
+		}
+
+		usort($users, function ($a, $b) {
+			/**
+			 * @var \OC\User\User $a
+			 * @var \OC\User\User $b
+			 */
+			return strcmp($a->getDisplayName(), $b->getDisplayName());
+		});
+		return $users;
+	}
+
+	/**
+	 * @param string $uid
+	 * @param string $password
+	 * @throws \Exception
+	 * @return bool | \OC\User\User the created user of false
+	 */
+	public function createUser($uid, $password) {
+		// Check the name for bad characters
+		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
+		if (preg_match('/[^a-zA-Z0-9 _\.@\-]/', $uid)) {
+			throw new \Exception('Only the following characters are allowed in a username:'
+			. ' "a-z", "A-Z", "0-9", and "_.@-"');
+		}
+		// No empty username
+		if (trim($uid) == '') {
+			throw new \Exception('A valid username must be provided');
+		}
+		// No empty password
+		if (trim($password) == '') {
+			throw new \Exception('A valid password must be provided');
+		}
+
+		// Check if user already exists
+		if ($this->userExists($uid)) {
+			throw new \Exception('The username is already being used');
+		}
+
+		$this->emit('\OC\User', 'preCreateUser', array($uid, $password));
+		foreach ($this->backends as $backend) {
+			if ($backend->implementsActions(\OC_USER_BACKEND_CREATE_USER)) {
+				$backend->createUser($uid, $password);
+				$user = $this->getUserObject($uid, $backend);
+				$this->emit('\OC\User', 'postCreateUser', array($user, $password));
+				return $user;
+			}
+		}
+		return false;
+	}
+}
diff --git a/lib/user/session.php b/lib/user/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf93d9593afa8f76e4f55a5b6aceb149f6653934
--- /dev/null
+++ b/lib/user/session.php
@@ -0,0 +1,173 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\User;
+
+use OC\Hooks\Emitter;
+
+/**
+ * Class Session
+ *
+ * Hooks available in scope \OC\User:
+ * - preSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - postSetPassword(\OC\User\User $user, string $password, string $recoverPassword)
+ * - preDelete(\OC\User\User $user)
+ * - postDelete(\OC\User\User $user)
+ * - preCreateUser(string $uid, string $password)
+ * - postCreateUser(\OC\User\User $user)
+ * - preLogin(string $user, string $password)
+ * - postLogin(\OC\User\User $user)
+ * - logout()
+ *
+ * @package OC\User
+ */
+class Session implements Emitter {
+	/**
+	 * @var \OC\User\Manager $manager
+	 */
+	private $manager;
+
+	/**
+	 * @var \OC\Session\Session $session
+	 */
+	private $session;
+
+	/**
+	 * @var \OC\User\User $activeUser
+	 */
+	protected $activeUser;
+
+	/**
+	 * @param \OC\User\Manager $manager
+	 * @param \OC\Session\Session $session
+	 */
+	public function __construct($manager, $session) {
+		$this->manager = $manager;
+		$this->session = $session;
+	}
+
+	/**
+	 * @param string $scope
+	 * @param string $method
+	 * @param callable $callback
+	 */
+	public function listen($scope, $method, $callback) {
+		$this->manager->listen($scope, $method, $callback);
+	}
+
+	/**
+	 * @param string $scope optional
+	 * @param string $method optional
+	 * @param callable $callback optional
+	 */
+	public function removeListener($scope = null, $method = null, $callback = null) {
+		$this->manager->removeListener($scope, $method, $callback);
+	}
+
+	/**
+	 * get the manager object
+	 *
+	 * @return \OC\User\Manager
+	 */
+	public function getManager() {
+		return $this->manager;
+	}
+
+	/**
+	 * set the currently active user
+	 *
+	 * @param \OC\User\User $user
+	 */
+	public function setUser($user) {
+		if (is_null($user)) {
+			$this->session->remove('user_id');
+		} else {
+			$this->session->set('user_id', $user->getUID());
+		}
+		$this->activeUser = $user;
+	}
+
+	/**
+	 * get the current active user
+	 *
+	 * @return \OC\User\User
+	 */
+	public function getUser() {
+		if ($this->activeUser) {
+			return $this->activeUser;
+		} else {
+			$uid = $this->session->get('user_id');
+			if ($uid) {
+				$this->activeUser = $this->manager->get($uid);
+				return $this->activeUser;
+			} else {
+				return null;
+			}
+		}
+	}
+
+	/**
+	 * try to login with the provided credentials
+	 *
+	 * @param string $uid
+	 * @param string $password
+	 * @return bool
+	 */
+	public function login($uid, $password) {
+		$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
+		$user = $this->manager->get($uid);
+		if ($user) {
+			$result = $user->checkPassword($password);
+			if ($result and $user->isEnabled()) {
+				$this->setUser($user);
+				$this->manager->emit('\OC\User', 'postLogin', array($user, $password));
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * logout the user from the session
+	 */
+	public function logout() {
+		$this->manager->emit('\OC\User', 'logout');
+		$this->setUser(null);
+		$this->unsetMagicInCookie();
+	}
+
+	/**
+	 * Set cookie value to use in next page load
+	 *
+	 * @param string $username username to be set
+	 * @param string $token
+	 */
+	public function setMagicInCookie($username, $token) {
+		$secure_cookie = \OC_Config::getValue("forcessl", false); //TODO: DI for cookies and OC_Config
+		$expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+		setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie);
+		setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true);
+		setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie);
+	}
+
+	/**
+	 * Remove cookie for "remember username"
+	 */
+	public function unsetMagicInCookie() {
+		unset($_COOKIE["oc_username"]); //TODO: DI
+		unset($_COOKIE["oc_token"]);
+		unset($_COOKIE["oc_remember_login"]);
+		setcookie("oc_username", null, -1);
+		setcookie("oc_token", null, -1);
+		setcookie("oc_remember_login", null, -1);
+	}
+}
diff --git a/lib/user/user.php b/lib/user/user.php
new file mode 100644
index 0000000000000000000000000000000000000000..f9466b71499ff638e8d10e9293839b8d8bc77983
--- /dev/null
+++ b/lib/user/user.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\User;
+
+use OC\Hooks\Emitter;
+
+class User {
+	/**
+	 * @var string $uid
+	 */
+	private $uid;
+
+	/**
+	 * @var string $displayName
+	 */
+	private $displayName;
+
+	/**
+	 * @var \OC_User_Backend $backend
+	 */
+	private $backend;
+
+	/**
+	 * @var bool $enabled
+	 */
+	private $enabled;
+
+	/**
+	 * @var Emitter | Manager $emitter
+	 */
+	private $emitter;
+
+	/**
+	 * @param string $uid
+	 * @param \OC_User_Backend $backend
+	 * @param Emitter $emitter
+	 */
+	public function __construct($uid, $backend, $emitter = null) {
+		$this->uid = $uid;
+		if ($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+			$this->displayName = $backend->getDisplayName($uid);
+		} else {
+			$this->displayName = $uid;
+		}
+		$this->backend = $backend;
+		$this->emitter = $emitter;
+		$enabled = \OC_Preferences::getValue($uid, 'core', 'enabled', 'true'); //TODO: DI for OC_Preferences
+		$this->enabled = ($enabled === 'true');
+	}
+
+	/**
+	 * get the user id
+	 *
+	 * @return string
+	 */
+	public function getUID() {
+		return $this->uid;
+	}
+
+	/**
+	 * get the displayname for the user, if no specific displayname is set it will fallback to the user id
+	 *
+	 * @return string
+	 */
+	public function getDisplayName() {
+		return $this->displayName;
+	}
+
+	/**
+	 * set the displayname for the user
+	 *
+	 * @param string $displayName
+	 * @return bool
+	 */
+	public function setDisplayName($displayName) {
+		if ($this->canChangeDisplayName()) {
+			$this->displayName = $displayName;
+			$result = $this->backend->setDisplayName($this->uid, $displayName);
+			return $result !== false;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Delete the user
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+		if ($this->emitter) {
+			$this->emitter->emit('\OC\User', 'preDelete', array($this));
+		}
+		$result = $this->backend->deleteUser($this->uid);
+		if ($this->emitter) {
+			$this->emitter->emit('\OC\User', 'postDelete', array($this));
+		}
+		return !($result === false);
+	}
+
+	/**
+	 * Check if the password is valid for the user
+	 *
+	 * @param $password
+	 * @return bool
+	 */
+	public function checkPassword($password) {
+		if ($this->backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
+			$result = $this->backend->checkPassword($this->uid, $password);
+			if ($result !== false) {
+				$this->uid = $result;
+			}
+			return !($result === false);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Set the password of the user
+	 *
+	 * @param string $password
+	 * @param string $recoveryPassword for the encryption app to reset encryption keys
+	 * @return bool
+	 */
+	public function setPassword($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));
+			}
+			return !($result === false);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * get the users home folder to mount
+	 *
+	 * @return string
+	 */
+	public function getHome() {
+		if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+			return $home;
+		}
+		return \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $this->uid; //TODO switch to Config object once implemented
+	}
+
+	/**
+	 * check if the backend supports changing passwords
+	 *
+	 * @return bool
+	 */
+	public function canChangePassword() {
+		return $this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD);
+	}
+
+	/**
+	 * check if the backend supports changing display names
+	 *
+	 * @return bool
+	 */
+	public function canChangeDisplayName() {
+		return $this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME);
+	}
+
+	/**
+	 * check if the user is enabled
+	 *
+	 * @return bool
+	 */
+	public function isEnabled() {
+		return $this->enabled;
+	}
+
+	/**
+	 * set the enabled status for the user
+	 *
+	 * @param bool $enabled
+	 */
+	public function setEnabled($enabled) {
+		$this->enabled = $enabled;
+		$enabled = ($enabled) ? 'true' : 'false';
+		\OC_Preferences::setValue($this->uid, 'core', 'enabled', $enabled);
+	}
+}
diff --git a/lib/util.php b/lib/util.php
index 37fb1bd9d06f1bfd9cad971da4ecec525d28b4e5..95af22ed0eedfa9481ae2f63b7caa997ba32a307 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,4 +1,7 @@
 <?php
+
+require_once 'Patchwork/PHP/Shim/Normalizer.php';
+
 /**
  * Class for utility functions
  *
@@ -38,6 +41,7 @@ class OC_Util {
 
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
+		\OC\Files\Filesystem::initMounts();
 		if(!self::$rootMounted) {
 			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
 			self::$rootMounted=true;
@@ -66,6 +70,7 @@ class OC_Util {
 	public static function tearDownFS() {
 		\OC\Files\Filesystem::tearDown();
 		self::$fsSetup=false;
+        self::$rootMounted=false;
 	}
 
 	/**
@@ -75,7 +80,7 @@ class OC_Util {
 	public static function getVersion() {
 		// hint: We only can count up. Reset minor/patchlevel when
 		// updating major/minor version number.
-		return array(5, 80, 01);
+		return array(5, 80, 05);
 	}
 
 	/**
@@ -149,10 +154,10 @@ class OC_Util {
 	 * @param bool dateOnly option to omit time from the result
 	 */
 	public static function formatDate( $timestamp, $dateOnly=false) {
-		if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it
+		if(\OC::$session->exists('timezone')) {//adjust to clients timezone if we know it
 			$systemTimeZone = intval(date('O'));
 			$systemTimeZone=(round($systemTimeZone/100, 0)*60)+($systemTimeZone%100);
-			$clientTimeZone=$_SESSION['timezone']*60;
+			$clientTimeZone=\OC::$session->get('timezone')*60;
 			$offset=$clientTimeZone-$systemTimeZone;
 			$timestamp=$timestamp+$offset*60;
 		}
@@ -171,7 +176,8 @@ class OC_Util {
 		//check for database drivers
 		if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
 			and !is_callable('mysql_connect')
-			and !is_callable('pg_connect')) {
+			and !is_callable('pg_connect')
+			and !is_callable('oci_connect')) {
 			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.',
 				'hint'=>'');//TODO: sane hint
 			$web_server_restart= true;
@@ -220,63 +226,63 @@ class OC_Util {
 		if(!class_exists('ZipArchive')) {
 			$errors[]=array('error'=>'PHP module zip not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!class_exists('DOMDocument')) {
 			$errors[] = array('error' => 'PHP module dom not installed.',
 				'hint' => 'Please ask your server administrator to install the module.');
-			$web_server_restart = false;
+			$web_server_restart =true;
 		}
 		if(!function_exists('xml_parser_create')) {
 			$errors[] = array('error' => 'PHP module libxml not installed.',
 				'hint' => 'Please ask your server administrator to install the module.');
-			$web_server_restart = false;
+			$web_server_restart =true;
 		}
 		if(!function_exists('mb_detect_encoding')) {
 			$errors[]=array('error'=>'PHP module mb multibyte not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!function_exists('ctype_digit')) {
 			$errors[]=array('error'=>'PHP module ctype is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!function_exists('json_encode')) {
 			$errors[]=array('error'=>'PHP module JSON is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
-		if(!function_exists('imagepng')) {
+		if(!extension_loaded('gd') || !function_exists('gd_info')) {
 			$errors[]=array('error'=>'PHP module GD is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!function_exists('gzencode')) {
 			$errors[]=array('error'=>'PHP module zlib is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!function_exists('iconv')) {
 			$errors[]=array('error'=>'PHP module iconv is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!function_exists('simplexml_load_string')) {
 			$errors[]=array('error'=>'PHP module SimpleXML is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(floatval(phpversion())<5.3) {
 			$errors[]=array('error'=>'PHP 5.3 is required.',
 				'hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher.'
 					.' PHP 5.2 is no longer supported by ownCloud and the PHP community.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if(!defined('PDO::ATTR_DRIVER_NAME')) {
 			$errors[]=array('error'=>'PHP PDO module is not installed.',
 				'hint'=>'Please ask your server administrator to install the module.');
-			$web_server_restart= false;
+			$web_server_restart=true;
 		}
 		if (((strtolower(@ini_get('safe_mode')) == 'on')
 			|| (strtolower(@ini_get('safe_mode')) == 'yes')
@@ -284,7 +290,12 @@ class OC_Util {
 			|| (ini_get("safe_mode") == 1 ))) {
 			$errors[]=array('error'=>'PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.',
 				'hint'=>'PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
-			$web_server_restart= false;
+			$web_server_restart=true;
+		}
+		if (get_magic_quotes_gpc() == 1 ) {
+			$errors[]=array('error'=>'Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.',
+				'hint'=>'Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
+			$web_server_restart=true;
 		}
 
 		if($web_server_restart) {
@@ -450,13 +461,13 @@ class OC_Util {
 	 */
 	public static function callRegister() {
 		// Check if a token exists
-		if(!isset($_SESSION['requesttoken'])) {
+		if(!\OC::$session->exists('requesttoken')) {
 			// No valid token found, generate a new one.
 			$requestToken = self::generate_random_bytes(20);
-			$_SESSION['requesttoken']=$requestToken;
+			\OC::$session->set('requesttoken', $requestToken);
 		} else {
 			// Valid token already exists, send it
-			$requestToken = $_SESSION['requesttoken'];
+			$requestToken = \OC::$session->get('requesttoken');
 		}
 		return($requestToken);
 	}
@@ -468,7 +479,7 @@ class OC_Util {
 	 * @see OC_Util::callRegister()
 	 */
 	public static function isCallRegistered() {
-		if(!isset($_SESSION['requesttoken'])) {
+		if(!\OC::$session->exists('requesttoken')) {
 			return false;
 		}
 
@@ -484,7 +495,7 @@ class OC_Util {
 		}
 
 		// Check if the token is valid
-		if($token !== $_SESSION['requesttoken']) {
+		if($token !== \OC::$session->get('requesttoken')) {
 			// Not valid
 			return false;
 		} else {
@@ -595,7 +606,7 @@ class OC_Util {
 		} catch(\Sabre_DAV_Exception_NotAuthenticated $e) {
 			$return = true;
 		} catch(\Exception $e) {
-			OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e, OC_Log::WARN);
+			OC_Log::write('core', 'isWebDAVWorking: NO - Reason: '.$e->getMessage(). ' ('.get_class($e).')', OC_Log::WARN);
 			$return = false;
 		}
 
@@ -633,11 +644,10 @@ class OC_Util {
 	/**
 	 * Check if the ownCloud server can connect to the internet
 	 */
-	public static function isinternetconnectionworking() {
-
-		// in case there is no internet connection on purpose there is no need to display a warning
-		if (!\OC_Config::getValue("has_internet_connection", true)) {
-			return true;
+	public static function isInternetConnectionWorking() {
+		// in case there is no internet connection on purpose return false
+		if (self::isInternetConnectionEnabled() === false) {
+			return false;
 		}
 
 		// try to connect to owncloud.org to see if http connections to the internet are possible.
@@ -659,6 +669,13 @@ class OC_Util {
 		}
 
 	}
+	
+	/**
+	 * Check if the connection to the internet is disabled on purpose
+	 */
+	public static function isInternetConnectionEnabled(){
+		return \OC_Config::getValue("has_internet_connection", true);
+	}
 
 	/**
 	 * clear all levels of output buffering
@@ -795,4 +812,41 @@ class OC_Util {
 		return (substr(PHP_OS, 0, 3) === "WIN");
 	}
 
+
+	/**
+	 * Handles the case that there may not be a theme, then check if a "default"
+	 * theme exists and take that one
+	 * @return string the theme
+	 */
+	public static function getTheme() {
+		$theme = OC_Config::getValue("theme");
+
+		if(is_null($theme)) {
+			
+			if(is_dir(OC::$SERVERROOT . '/themes/default')) {
+				$theme = 'default';
+			}
+
+		}
+
+		return $theme;
+	}
+
+	/**
+	 * Normalize a unicode string
+	 * @param string $value a not normalized string
+	 * @return bool|string
+	 */
+	public static function normalizeUnicode($value) {
+		if(class_exists('Patchwork\PHP\Shim\Normalizer')) {
+			$normalizedValue = \Patchwork\PHP\Shim\Normalizer::normalize($value);
+			if($normalizedValue === false) {
+				\OC_Log::write( 'core', 'normalizing failed for "' . $value . '"', \OC_Log::WARN);
+			} else {
+				$value = $normalizedValue;
+			}
+		}
+
+		return $value;
+	}
 }
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 5975e688b75cad4ff9a5422c3052a3aedfc9a6b8..91c72d5dfaecda0cf31c007f8a411b45b8bf3ae7 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -324,6 +324,37 @@ class OC_VCategories {
 		return $id;
 	}
 
+	/**
+	* @brief Rename category.
+	* @param string $from The name of the existing category
+	* @param string $to The new name of the category.
+	* @returns bool
+	*/
+	public function rename($from, $to) {
+		$id = $this->array_searchi($from, $this->categories);
+		if($id === false) {
+			OCP\Util::writeLog('core', __METHOD__.', category: ' . $from. ' does not exist', OCP\Util::DEBUG);
+			return false;
+		}
+
+		$sql = 'UPDATE `' . self::CATEGORY_TABLE . '` SET `category` = ? '
+			. 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
+		try {
+			$stmt = OCP\DB::prepare($sql);
+			$result = $stmt->execute(array($to, $this->user, $this->type, $id));
+			if (OC_DB::isError($result)) {
+				OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
+				return false;
+			}
+		} catch(Exception $e) {
+			OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+				OCP\Util::ERROR);
+			return false;
+		}
+		$this->categories[$id] = $to;
+		return true;
+	}
+
 	/**
 	* @brief Add a new category.
 	* @param $names A string with a name or an array of strings containing
diff --git a/lib/vobject/compoundproperty.php b/lib/vobject/compoundproperty.php
new file mode 100644
index 0000000000000000000000000000000000000000..d702ab802e0e835bf35141274ed4d2322533046a
--- /dev/null
+++ b/lib/vobject/compoundproperty.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * ownCloud - VObject Compound Property
+ *
+ * @author Thomas Tanghus
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\VObject;
+
+/**
+ * This class overrides \Sabre\VObject\Property::serialize() to not
+ * double escape commas and semi-colons in compound properties.
+*/
+class CompoundProperty extends \Sabre\VObject\Property\Compound {
+
+	/**
+	* Turns the object back into a serialized blob.
+	*
+	* @return string
+	*/
+	public function serialize() {
+
+		$str = $this->name;
+		if ($this->group) {
+			$str = $this->group . '.' . $this->name;
+		}
+
+		foreach($this->parameters as $param) {
+			$str.=';' . $param->serialize();
+		}
+		$src = array(
+			"\n",
+		);
+		$out = array(
+			'\n',
+		);
+		$str.=':' . str_replace($src, $out, $this->value);
+
+		$out = '';
+		while(strlen($str) > 0) {
+			if (strlen($str) > 75) {
+				$out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
+				$str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
+			} else {
+				$out .= $str . "\r\n";
+				$str = '';
+				break;
+			}
+		}
+
+		return $out;
+
+	}
+
+}
\ No newline at end of file
diff --git a/ocs/routes.php b/ocs/routes.php
index 81beae2f88104988481bdca6e90e4628b6eff37a..5fcf05e4f99b4f0204cf53b4cfee1c3877a2d6c9 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -6,16 +6,72 @@
  */
 
 // Config
-OC_API::register('get', '/config', array('OC_OCS_Config', 'apiConfig'), 'ocs', OC_API::GUEST_AUTH);
+OC_API::register(
+	'get',
+	'/config',
+	array('OC_OCS_Config', 'apiConfig'),
+	'core',
+	OC_API::GUEST_AUTH
+	);
 // Person
-OC_API::register('post', '/person/check', array('OC_OCS_Person', 'check'), 'ocs', OC_API::GUEST_AUTH);
+OC_API::register(
+	'post',
+	'/person/check',
+	array('OC_OCS_Person', 'check'),
+	'core',
+	OC_API::GUEST_AUTH
+	);
 // Activity
-OC_API::register('get', '/activity', array('OC_OCS_Activity', 'activityGet'), 'ocs', OC_API::USER_AUTH); 
+OC_API::register(
+	'get',
+	'/activity',
+	array('OC_OCS_Activity', 'activityGet'),
+	'core',
+	OC_API::USER_AUTH
+	); 
 // Privatedata
-OC_API::register('get', '/privatedata/getattribute', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('app' => '', 'key' => ''));
-OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH, array('key' => ''));
-OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH);
-OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH);
-OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH);
+OC_API::register(
+	'get',
+	'/privatedata/getattribute',
+	array('OC_OCS_Privatedata', 'get'),
+	'core',
+	OC_API::USER_AUTH,
+	array('app' => '', 'key' => '')
+	);
+OC_API::register(
+	'get',
+	'/privatedata/getattribute/{app}',
+	array('OC_OCS_Privatedata', 'get'),
+	'core',
+	OC_API::USER_AUTH,
+	array('key' => '')
+	);
+OC_API::register(
+	'get',
+	'/privatedata/getattribute/{app}/{key}',
+	array('OC_OCS_Privatedata', 'get'),
+	'core',
+	OC_API::USER_AUTH
+	);
+OC_API::register(
+	'post',
+	'/privatedata/setattribute/{app}/{key}',
+	array('OC_OCS_Privatedata', 'set'),
+	'core',
+	OC_API::USER_AUTH
+	);
+OC_API::register(
+	'post',
+	'/privatedata/deleteattribute/{app}/{key}',
+	array('OC_OCS_Privatedata', 'delete'),
+	'core',
+	OC_API::USER_AUTH
+	);
 // cloud
-OC_API::register('get', '/cloud/capabilities', array('OC_OCS_Cloud', 'getCapabilities'), 'core', OC_API::USER_AUTH);
\ No newline at end of file
+OC_API::register(
+	'get',
+	'/cloud/capabilities',
+	array('OC_OCS_Cloud', 'getCapabilities'),
+	'core',
+	OC_API::USER_AUTH
+	);
\ No newline at end of file
diff --git a/public.php b/public.php
index 759e8e91619276bc1f45e2f9913cd23654ea3e84..3d7fd378af402e0f739bd86eabf8a656ec43eec9 100644
--- a/public.php
+++ b/public.php
@@ -1,6 +1,7 @@
 <?php
 $RUNTIME_NOAPPS = true;
 require_once 'lib/base.php';
+OC::checkMaintenanceMode();
 if (!isset($_GET['service'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit;
diff --git a/settings/admin.php b/settings/admin.php
index c7848803095e2e794a90a9e9c5822e9859996677..db041ef889c08e527fd9bdffc0b514e37b50c0ed 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -20,16 +20,11 @@ $htaccessworking=OC_Util::ishtaccessworking();
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
 
-function compareEntries($a, $b) {
-	return $b->time - $a->time;
-}
-usort($entries, 'compareEntries');
-
 $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
+$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
 $tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
 $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index dff4d733cd213790ee6469c18d52fb99f4847c31..faf962fbdd7fa2ca63395c50be5af9b4e1894048 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -4,6 +4,8 @@
 OCP\JSON::callCheck();
 OC_JSON::checkLoggedIn();
 
+$l=OC_L10N::get('core');
+
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $displayName = $_POST["displayName"];
 
@@ -26,7 +28,7 @@ if(is_null($userstatus)) {
 
 // Return Success story
 if( OC_User::setDisplayName( $username, $displayName )) {
-	OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
+	OC_JSON::success(array("data" => array( "message" => $l->t('Your display name has been changed.'), "username" => $username, 'displayName' => $displayName )));
 }
 else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) )));
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 1fc6d0e10002eae6296f1701bf8544c6150aa165..cb66c57c743bcb9fc4fcb9bfb5bbff50a0b9753d 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -10,6 +10,7 @@ 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;
 
 $userstatus = null;
 if(OC_User::isAdminUser(OC_User::getUser())) {
@@ -27,8 +28,15 @@ if(is_null($userstatus)) {
 	exit();
 }
 
-// Return Success story
-if(!is_null($password) && OC_User::setPassword( $username, $password )) {
+$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
+$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+
+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{
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 141457e72a0ad1bf4ec7eaefa5f1ba27f8515d7b..da69a2863b75b05c0ec972e9931c689e367d0e49 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -13,6 +13,9 @@ $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 $entries=OC_Log_Owncloud::getEntries($count, $offset);
 $data = array();
 
-OC_JSON::success(array(
-	"data" => $entries,
-	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
+OC_JSON::success(
+	array(
+		"data" => $entries,
+		"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) != 0) ? true : false
+	)
+);
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index cd8dc0e2796ee8fe99df217f6009a1e86f85f87b..8dcb7ddd424bc234b696bef8224ea865ac4cfa94 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -22,11 +22,7 @@ if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))
 $quota=$_POST["quota"];
 if($quota!='none' and $quota!='default') {
 	$quota= OC_Helper::computerFileSize($quota);
-	if($quota==0) {
-		$quota='default';
-	}else{
-		$quota=OC_Helper::humanFileSize($quota);
-	}
+	$quota=OC_Helper::humanFileSize($quota);
 }
 
 // Return Success story
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 87b42395749c74398b78cd12db4caf40023b13b0..4abf54b8987e36ed2b598d3afa1c2a0044137ec6 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -27,9 +27,14 @@ if (isset($_GET['offset'])) {
 } else {
 	$offset = 0;
 }
+if (isset($_GET['limit'])) {
+	$limit = $_GET['limit'];
+} else {
+	$limit = 10;
+}
 $users = array();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getDisplayNames('', 10, $offset);
+	$batch = OC_User::getDisplayNames('', $limit, $offset);
 	foreach ($batch as $user => $displayname) {
 		$users[] = array(
 			'name' => $user,
@@ -40,7 +45,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
+	$batch = OC_Group::usersInGroups($groups, '', $limit, $offset);
 	foreach ($batch as $user) {
 		$users[] = array(
 			'name' => $user,
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 46a0bbe7c3219ca1cce12b0f9bcab5d2fa06728b..950e892901208a799fe42702d4897212cca4aa3b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -45,6 +45,8 @@ table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:-1px; }
 div.quota-select-wrapper { position: relative; }
+div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
+input#recoveryPassword {width:15em;}
 select.quota { position:absolute; left:0; top:0; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
 div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
diff --git a/settings/img/admin.png b/settings/img/admin.png
index d883f0b61a329a011a151ef382a0f3284bde9d15..8023d8de85041ac680bcdc20c889c13f084973e6 100644
Binary files a/settings/img/admin.png and b/settings/img/admin.png differ
diff --git a/settings/img/admin.svg b/settings/img/admin.svg
index 1ea226231b3a36616f472a7b9d08453112a93e86..90d87272017e929ce3ca1b2a51bb5492d6dded84 100644
--- a/settings/img/admin.svg
+++ b/settings/img/admin.svg
@@ -1,2128 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="admin.svg"
-   inkscape:export-filename="admin.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="16.000001"
-     inkscape:cx="0.93200388"
-     inkscape:cy="4.680543"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4566-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       id="linearGradient3587-6-5-26">
-      <stop
-         id="stop3589-9-2-45"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-20"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       id="linearGradient4580-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-2-1">
-      <stop
-         id="stop3589-9-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="1013.451"
-       x2="209.34245"
-       y1="998.45801"
-       x1="209.34245"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3528"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       id="linearGradient3335-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-4">
-      <stop
-         id="stop3589-9-2-8-7-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-6"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-8-3">
-      <stop
-         id="stop3589-9-2-67-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3584">
-      <stop
-         id="stop3586"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3588"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3591">
-      <stop
-         id="stop3593"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3595"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3598">
-      <stop
-         id="stop3600"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3602"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-8-3-9">
-      <stop
-         id="stop3589-9-2-67-4-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-9-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4682">
-      <stop
-         id="stop4684"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4686"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4689">
-      <stop
-         id="stop4691"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4693"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       id="linearGradient4665-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4696">
-      <stop
-         id="stop4698"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4700"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1-5"
-       xlink:href="#linearGradient3587-6-5-86-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86-0">
-      <stop
-         id="stop3589-9-2-65-9"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427-9"
-       xlink:href="#linearGradient3587-6-5-86-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3630">
-      <stop
-         id="stop3632"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3634"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436-6"
-       xlink:href="#linearGradient3587-6-5-86-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3637">
-      <stop
-         id="stop3639"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3641"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442-8"
-       xlink:href="#linearGradient3587-6-5-86-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3644">
-      <stop
-         id="stop3646"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3648"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-86-0"
-       id="linearGradient4919"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)"
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-86-0-6"
-       id="linearGradient4911-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)"
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17" />
-    <linearGradient
-       id="linearGradient3587-6-5-86-0-6">
-      <stop
-         id="stop3589-9-2-65-9-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17"
-       x2="11"
-       y1="6"
-       x1="11"
-       gradientTransform="matrix(0.15503877,0,0,0.11235953,3.7984496,11.52809)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4936"
-       xlink:href="#linearGradient3587-6-5-86-0-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-86-0-9">
-      <stop
-         id="stop3589-9-2-65-9-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5080">
-      <stop
-         id="stop5082"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5084"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5087">
-      <stop
-         id="stop5089"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5091"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-86-0-9"
-       id="linearGradient4907-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)"
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17" />
-    <linearGradient
-       id="linearGradient5094">
-      <stop
-         id="stop5096"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5098"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       id="path7671"
-       d="M 2,2 2,5 5,5 5,2 2,2 z M 6,3 6,4 14,4 14,3 6,3 z M 2,6 2,9 5,9 5,6 2,6 z m 4,1 0,1 8,0 0,-1 -8,0 z m -4,3 0,3 3,0 0,-3 -3,0 z m 1,1 1,0 0,1 -1,0 0,-1 z m 3,0 0,1 8,0 0,-1 -8,0 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 2 3 L 2 6 L 5 6 L 5 3 L 2 3 z M 6 4 L 6 5 L 14 5 L 14 4 L 6 4 z M 2 7 L 2 10 L 5 10 L 5 7 L 2 7 z M 6 8 L 6 9 L 14 9 L 14 8 L 6 8 z M 2 11 L 2 14 L 5 14 L 5 11 L 2 11 z M 3 12 L 4 12 L 4 13 L 3 13 L 3 12 z M 6 12 L 6 13 L 14 13 L 14 12 L 6 12 z "
-       id="path2407-9" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 2v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm1 1h1v1h-1v-1zm3 0v1h8v-1h-8z"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm4 1v1h8v-1h-8zm-4 3v3h3v-3h-3zm1 1h1v1h-1v-1zm3 0v1h8v-1h-8z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/settings/img/apps.png b/settings/img/apps.png
index de5ccbd2c5fc6276a7ea359fd8b708b85baff6df..2b18f678a0295f45a82250698440a9b6d9e1ed43 100644
Binary files a/settings/img/apps.png and b/settings/img/apps.png differ
diff --git a/settings/img/apps.svg b/settings/img/apps.svg
index d3415921209e96e9b275d593b17d1c68d12d14c3..e2cc48f295697fc61dfdd1349be43714b981345c 100644
--- a/settings/img/apps.svg
+++ b/settings/img/apps.svg
@@ -1,2113 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="apps.svg"
-   inkscape:export-filename="apps.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="16.000001"
-     inkscape:cx="-11.700054"
-     inkscape:cy="5.0070539"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-26"
-       id="linearGradient4566-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       id="linearGradient3587-6-5-26">
-      <stop
-         id="stop3589-9-2-45"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-20"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       id="linearGradient4580-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-2-1">
-      <stop
-         id="stop3589-9-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="1013.451"
-       x2="209.34245"
-       y1="998.45801"
-       x1="209.34245"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3528"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       id="linearGradient3335-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-4">
-      <stop
-         id="stop3589-9-2-8-7-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-6"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3567"
-       xlink:href="#linearGradient3587-6-5-2-4-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5021-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-3">
-      <stop
-         id="stop3589-9-2-67-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5018-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3584">
-      <stop
-         id="stop3586"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3588"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5015-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3591">
-      <stop
-         id="stop3593"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3595"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient5012-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3598">
-      <stop
-         id="stop3600"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3602"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4638"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4640"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4644"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4659"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4663"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4665"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-3-9">
-      <stop
-         id="stop3589-9-2-67-4-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-9-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       id="linearGradient4661-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4682">
-      <stop
-         id="stop4684"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4686"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4689">
-      <stop
-         id="stop4691"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4693"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       id="linearGradient4665-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4696">
-      <stop
-         id="stop4698"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4700"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="19.490837"
-       x2="26.045763"
-       y1="9.6223383"
-       x1="26.045763"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4707"
-       xlink:href="#linearGradient3587-6-5-8-3-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-3"
-       id="linearGradient4829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       id="path7131"
-       d="M 2,2 2,2.5 2,5.5 2,6 2.5,6 5.5,6 6,6 6,5.5 6,2.5 6,2 5.5,2 2.5,2 2,2 z m 8,0 0,0.5 0,3 0,0.5 0.5,0 3,0 0.5,0 0,-0.5 0,-3 0,-0.5 -0.5,0 -3,0 -0.5,0 z m -8,7 0,0.5 0,3 0,0.5 0.5,0 3,0 L 6,13 6,12.5 6,9.5 6,9 5.5,9 2.5,9 2,9 z m 8,0 0,0.5 0,3 0,0.5 0.5,0 3,0 0.5,0 0,-0.5 0,-3 0,-0.5 -0.5,0 -3,0 -0.5,0 z m 1,1 2,0 0,2 -2,0 0,-2 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       inkscape:connector-curvature="0" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 2 3 L 2 3.5 L 2 6.5 L 2 7 L 2.5 7 L 5.5 7 L 6 7 L 6 6.5 L 6 3.5 L 6 3 L 5.5 3 L 2.5 3 L 2 3 z M 10 3 L 10 3.5 L 10 6.5 L 10 7 L 10.5 7 L 13.5 7 L 14 7 L 14 6.5 L 14 3.5 L 14 3 L 13.5 3 L 10.5 3 L 10 3 z M 2 10 L 2 10.5 L 2 13.5 L 2 14 L 2.5 14 L 5.5 14 L 6 14 L 6 13.5 L 6 10.5 L 6 10 L 5.5 10 L 2.5 10 L 2 10 z M 10 10 L 10 10.5 L 10 13.5 L 10 14 L 10.5 14 L 13.5 14 L 14 14 L 14 13.5 L 14 10.5 L 14 10 L 13.5 10 L 10.5 10 L 10 10 z M 11 11 L 13 11 L 13 13 L 11 13 L 11 11 z "
-       id="rect3187" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 2v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m2 3v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm-8 7v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm8 0v0.5 3 0.5h0.5 3 0.5v-0.5-3-0.5h-0.5-3-0.5zm1 1h2v2h-2v-2z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/settings/img/help.png b/settings/img/help.png
index c0200096735bb7394db96e70170a18b3dbf3b127..00d9761ee363fdfdf979280edf980b504b3e6d1b 100644
Binary files a/settings/img/help.png and b/settings/img/help.png differ
diff --git a/settings/img/help.svg b/settings/img/help.svg
index 55b68e6baf29bbbf579bbca3be493c3064c251ef..f393ab5b1fd69ca776a730e31ffb0fb0edabbc6f 100644
--- a/settings/img/help.svg
+++ b/settings/img/help.svg
@@ -1,1744 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="help.svg"
-   inkscape:export-filename="help.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="6.55629"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="20.074369"
-       x2="14.152531"
-       y1="-1.4095211"
-       x1="14.501121"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3437"
-       xlink:href="#linearGradient3587-6-5-19"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-4"
-       id="linearGradient4357-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       id="linearGradient3587-6-5-4">
-      <stop
-         id="stop3589-9-2-1"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-04"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       d="M 5,7.4745455 C 5.1553559,7.8555569 5.3254225,8.1626049 5.6445055,7.7203686 6.0511155,7.4518883 7.4032866,6.2925134 7.306182,7.3783314 6.9380321,9.3952173 6.4719842,11.395026 6.1350434,13.416813 5.7433935,14.532242 6.7700459,15.485145 7.7729966,14.729405 8.8508925,14.226276 9.7645378,13.440939 10.701,12.716521 10.556654,12.394581 10.45052,11.928009 10.104148,12.370754 9.6358672,12.60987 8.6349897,13.688222 8.4078086,12.841549 8.7231912,10.661003 9.3833675,8.5467083 9.7732743,6.3804237 10.171027,5.3755033 9.4087907,4.1570843 8.3735125,5.0170344 7.1169594,5.6343496 6.0839075,6.6013769 5,7.4745455 z M 9.4594228,0.00267693 C 8.1518785,-0.01465888 7.5537936,2.148248 8.8167256,2.6822129 9.8391583,3.0601798 10.893193,1.968369 10.606228,0.93179353 10.508499,0.38994073 10.008923,-0.0379875 9.4594238,0.00267693 l -10e-7,0 z"
-       id="path6558"
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold"
-       id="path3536"
-       d="M 5,8.4745452 C 5.1553559,8.8555566 5.3254225,9.1626046 5.6445055,8.7203683 6.0511155,8.451888 7.4032866,7.2925131 7.306182,8.3783311 6.9380321,10.395217 6.4719842,12.395026 6.1350434,14.416813 5.7433935,15.532242 6.7700459,16.485145 7.7729966,15.729405 8.8508925,15.226276 9.7645378,14.440939 10.701,13.716521 10.556654,13.394581 10.45052,12.928009 10.104148,13.370754 9.6358672,13.60987 8.6349897,14.688222 8.4078086,13.841549 8.7231912,11.661003 9.3833675,9.546708 9.7732743,7.3804234 10.171027,6.375503 9.4087907,5.157084 8.3735125,6.0170341 7.1169594,6.6343493 6.0839075,7.6013766 5,8.4745452 z M 9.4594228,1.0026766 C 8.1518785,0.98534079 7.5537936,3.1482477 8.8167256,3.6822126 9.8391583,4.0601795 10.893193,2.9683687 10.606228,1.9317932 10.508499,1.3899404 10.008923,0.96201217 9.4594238,1.0026766 l -10e-7,0 z" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+  <path d="m5 7.4745c0.1554 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7588-1.4279 1.6617-0.3421-0.3682 2.0169-0.8342 4.0167-1.1712 6.0387-0.3916 1.115 0.635 2.068 1.638 1.312 1.0779-0.503 1.9915-1.288 2.928-2.012-0.144-0.322-0.25-0.789-0.597-0.346-0.4681 0.239-1.469 1.317-1.6962 0.471 0.3154-2.181 0.9756-4.2953 1.3655-6.4616 0.3977-1.0049-0.3645-2.2233-1.3998-1.3634-1.2565 0.6173-2.2896 1.5844-3.3735 2.4575zm4.4594-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0225 0.378 2.0763-0.7138 1.7893-1.7504-0.098-0.54186-0.597-0.96979-1.1466-0.92912h-0.000001z"/>
+  <path d="m5 8.4745c0.1554 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7588-1.4279 1.6617-0.3421-0.3682 2.0167-0.8342 4.0167-1.1712 6.0387-0.3916 1.115 0.635 2.068 1.638 1.312 1.0779-0.503 1.9915-1.288 2.928-2.012-0.144-0.322-0.25-0.789-0.597-0.346-0.4681 0.239-1.469 1.317-1.6962 0.471 0.3154-2.181 0.9756-4.2953 1.3655-6.4616 0.3977-1.0049-0.3645-2.2233-1.3998-1.3634-1.2565 0.6173-2.2896 1.5844-3.3735 2.4575zm4.4594-7.4718c-1.3075-0.01736-1.9056 2.1455-0.6427 2.6795 1.0225 0.378 2.0763-0.7138 1.7893-1.7504-0.098-0.5419-0.597-0.96979-1.1466-0.9291h-0.000001z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/settings/img/log.svg b/settings/img/log.svg
index 72d4758acebf3ddac75dbd3db512fd4d6f0b58fa..a3939b730934866b75cb11723460fd2f56831cc1 100644
--- a/settings/img/log.svg
+++ b/settings/img/log.svg
@@ -1,86 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="16px"
-   height="16px"
-   viewBox="0 0 100 100"
-   enable-background="new 0 0 100 100"
-   xml:space="preserve"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="log.svg"><metadata
-   id="metadata21"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs19" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1680"
-   inkscape:window-height="1004"
-   id="namedview17"
-   showgrid="false"
-   inkscape:zoom="3.06"
-   inkscape:cx="50"
-   inkscape:cy="50"
-   inkscape:window-x="-2"
-   inkscape:window-y="23"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<rect
-   x="75"
-   y="45"
-   width="4"
-   height="19"
-   id="rect3"
-   style="fill:#4d4d4d" />
-<polygon
-   points="21,0 21,19 25,19 25,4 75,4 75,19 79,19 79,0 "
-   id="polygon5"
-   style="fill:#4d4d4d" />
-<polygon
-   points="75,45 75,96 44,96 44,77 25,77 25,45 21,45 21,80 41,100 79,100 79,45 "
-   id="polygon7"
-   style="fill:#4d4d4d" />
-<rect
-   x="31"
-   y="45"
-   width="38"
-   height="3"
-   id="rect9"
-   style="fill:#4d4d4d" />
-<rect
-   x="31"
-   y="56"
-   width="38"
-   height="3"
-   id="rect11"
-   style="fill:#4d4d4d" />
-<rect
-   x="31"
-   y="67"
-   width="38"
-   height="3"
-   id="rect13"
-   style="fill:#4d4d4d" />
-<path
-   d="M0,21v48h19V59h-9V31h80v28h-9v10h19V21H0z M97,28h-4v-4h4V28z"
-   id="path15"
-   style="fill:#4d4d4d" />
-</svg>
\ No newline at end of file
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 100 100" xml:space="preserve" height="16px" viewBox="0 0 100 100" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><g fill="#4d4d4d">
+<rect height="19" width="4" y="45" x="75"/>
+<polygon points="21 0 21 19 25 19 25 4 75 4 75 19 79 19 79 0"/>
+<polygon points="75 45 75 96 44 96 44 77 25 77 25 45 21 45 21 80 41 100 79 100 79 45"/>
+<rect height="3" width="38" y="45" x="31"/>
+<rect height="3" width="38" y="56" x="31"/>
+<rect height="3" width="38" y="67" x="31"/>
+<path d="m0 21v48h19v-10h-9v-28h80v28h-9v10h19v-48h-100zm97 7h-4v-4h4v4z"/>
+</g></svg>
diff --git a/settings/img/personal.svg b/settings/img/personal.svg
index 2f3a77d07a22bc11f21516362dd6c144f26db58e..c0213f8589b6e850e9a14f8356c63dcb6b5801bd 100644
--- a/settings/img/personal.svg
+++ b/settings/img/personal.svg
@@ -1,1714 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="personal.svg"
-   inkscape:export-filename="personal.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="6.55629"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="47.208389"
-       x2="-39.421574"
-       y1="-5.2547116"
-       x1="-39.421574"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3397"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3417"
-       xlink:href="#linearGradient3587-6-5-10"
-       inkscape:collect="always" />
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       sodipodi:nodetypes="sccccsscscsscccccccsccscscsscccss"
-       inkscape:connector-curvature="0"
-       d="M 8.0037806,-1.6024174e-5 C 6.3807201,-1.6024174e-5 5.0038159,1.186928 5.0038159,2.718703 c 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 C 5.9313479,8.119786 5.0636516,8.411419 4.2850726,8.749892 3.84796,8.93992 3.4524206,9.10961 3.1288352,9.312386 2.8052509,9.515163 2.4834413,9.668364 2.3788448,10.124877 c -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499327,1.062488 2.1647184,-0.0084 4.3189754,-0.333832 5.6874324,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.3124721,-0.937489 -0.045118,-0.100507 -0.089936,-0.392929 0,-0.84374 C 9.4341669,6.878873 9.4719829,6.749222 9.5037669,6.624928 9.5795229,6.540078 9.63857,6.47074 9.7225145,6.374931 9.9015494,6.170591 10.093923,5.956233 10.253757,5.749939 10.413593,5.543644 10.544361,5.366667 10.628753,5.124945 L 10.66,5.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 C 11.003747,1.186948 9.6268455,3.9858261e-6 8.0037819,3.9858261e-6 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="path6033" />
-    <path
-       id="path2880-5-3"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 8.0037806,0.99998399 c -1.6230605,0 -2.9999647,1.18694401 -2.9999647,2.71871901 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 C 5.9313479,9.119786 5.0636516,9.411419 4.2850726,9.749892 3.84796,9.93992 3.4524206,10.10961 3.1288352,10.312386 c -0.3235843,0.202777 -0.6453939,0.355978 -0.7499904,0.812491 -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499327,1.062488 2.1647184,-0.0084 4.3189754,-0.333832 5.6874324,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.3124721,-0.937489 -0.045118,-0.100507 -0.089936,-0.392929 0,-0.84374 C 9.4341669,7.878873 9.4719829,7.749222 9.5037669,7.624928 9.5795229,7.540078 9.63857,7.47074 9.7225145,7.374931 9.9015494,7.170591 10.093923,6.956233 10.253757,6.749939 10.413593,6.543644 10.544361,6.366667 10.628753,6.124945 L 10.66,6.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 c 0,-1.531774 -1.3769015,-2.718718 -2.9999651,-2.718718 z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccsscscsscccccccsccscscsscccss" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0038-0.000016024c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3597-1.1563 0.5625-0.3235 0.2028-0.6454 0.356-0.75 0.8126-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.045118-0.10051-0.089936-0.39293 0-0.84374 0.0246-0.1213 0.0624-0.251 0.0942-0.3753 0.0757-0.0848 0.1348-0.1542 0.2187-0.25 0.179-0.2043 0.3715-0.4187 0.5315-0.625s0.29-0.3832 0.375-0.625l0.031-0.0312c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5319-1.3772-2.7188-3.0002-2.7188z"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0038 0.99998c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3601-1.1563 0.5621-0.32358 0.20278-0.64539 0.35598-0.74999 0.81249-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.045118-0.10051-0.089936-0.39293 0-0.84374 0.0246-0.1208 0.0624-0.2505 0.0942-0.3748 0.0757-0.0848 0.1348-0.1542 0.2187-0.25 0.179-0.2043 0.3715-0.4187 0.5315-0.625s0.29-0.3832 0.375-0.625l0.031-0.0312c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5318-1.3769-2.7187-3-2.7187z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/settings/img/users.png b/settings/img/users.png
index a811af47c1c25837f54996a0edfd645290b5233c..e819b5f320515a3eb664f1ee2b571ab0b6e11a45 100644
Binary files a/settings/img/users.png and b/settings/img/users.png differ
diff --git a/settings/img/users.svg b/settings/img/users.svg
index 5ef31b763bb8d3d96e99ac5e01f231bfdc5a8d33..9008e1d211f16e971ea00237dd518ad005842f7f 100644
--- a/settings/img/users.svg
+++ b/settings/img/users.svg
@@ -1,1723 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg11300"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="users.svg"
-   inkscape:export-filename="users.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#cccccc"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="745"
-     id="namedview24"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="22.627418"
-     inkscape:cx="6.55629"
-     inkscape:cy="9.2202448"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g4146">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4330"
-       empspacing="5"
-       dotted="true"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4136">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4303">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4305" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4307" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4297">
-      <stop
-         id="stop4299"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4301"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4115">
-      <stop
-         id="stop4117"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3789"
-         style="stop-color:#878787;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6954">
-      <stop
-         id="stop6960"
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop6962"
-         style="stop-color:#d2d2d2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         id="stop3343"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2856"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2858"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2860"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2862"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="30"
-       y1="0.91818392"
-       x2="30"
-       y2="25.792814"
-       id="linearGradient2864"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
-    <linearGradient
-       x1="29.955881"
-       y1="21.86607"
-       x2="29.955881"
-       y2="43.144382"
-       id="linearGradient2866"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient7308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
-       x1="34.992828"
-       y1="0.94087797"
-       x2="34.992828"
-       y2="33.955856" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3796"
-       x1="8.3635759"
-       y1="15.028702"
-       x2="15.937561"
-       y2="11.00073"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3798"
-       x1="6.9951797"
-       y1="4.7478018"
-       x2="13.00482"
-       y2="4.7478018"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3815"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3815-3"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
-       id="linearGradient3831"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3833">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3835" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3837" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3874"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       id="linearGradient3892-2"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient3984"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3909-3"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-7" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4115-9"
-       id="linearGradient4113-3"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4115-9">
-      <stop
-         id="stop4117-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4119-6"
-         style="stop-color:#363636;stop-opacity:0.698"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3104"
-       id="linearGradient3815-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471" />
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="13.138569"
-       cy="25.625349"
-       r="13.931416"
-       fx="13.138569"
-       fy="25.625349"
-       id="radialGradient2965"
-       xlink:href="#linearGradient3690-451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
-    <linearGradient
-       id="linearGradient3690-451">
-      <stop
-         id="stop2857"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2859"
-         style="stop-color:#d8d8d8;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2861"
-         style="stop-color:#c2c2c2;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2863"
-         style="stop-color:#a5a5a5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.483376"
-       y1="36.255058"
-       x2="21.483376"
-       y2="9.5799999"
-       id="linearGradient2967"
-       xlink:href="#linearGradient3603-84"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
-    <linearGradient
-       id="linearGradient3603-84">
-      <stop
-         id="stop2867"
-         style="stop-color:#707070;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2869"
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient3674-262"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249-529">
-      <stop
-         id="stop2873"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2875"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.046366"
-       y1="11.673002"
-       x2="24.046366"
-       y2="34.713669"
-       id="linearGradient3677-116"
-       xlink:href="#linearGradient3642-81"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
-    <linearGradient
-       id="linearGradient3642-81">
-      <stop
-         id="stop2879"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2881"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="34.713669"
-       x2="24.046366"
-       y1="11.673002"
-       x1="24.046366"
-       gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3037"
-       xlink:href="#linearGradient3642-81"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155-40"
-       id="linearGradient8639"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
-       spreadMethod="pad"
-       x1="23.575972"
-       y1="25.356892"
-       x2="23.575972"
-       y2="31.210939" />
-    <linearGradient
-       id="linearGradient3155-40">
-      <stop
-         id="stop2541"
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1;" />
-      <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
-         offset="0.13482948"
-         id="stop2543" />
-      <stop
-         id="stop2545"
-         offset="0.20224422"
-         style="stop-color:#a4a4a4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.26965895"
-         id="stop2547" />
-      <stop
-         id="stop2549"
-         offset="0.44650277"
-         style="stop-color:#8d8d8d;stop-opacity:1;" />
-      <stop
-         style="stop-color:#959595;stop-opacity:1;"
-         offset="0.57114136"
-         id="stop2551" />
-      <stop
-         id="stop2553"
-         offset="0.72038066"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop2555"
-         offset="1"
-         style="stop-color:#181818;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-279"
-       id="linearGradient8641"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-279">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2559" />
-      <stop
-         id="stop2561"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2563" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-789"
-       id="linearGradient8643"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-789">
-      <stop
-         id="stop2567"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2569" />
-      <stop
-         id="stop2571"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-686"
-       id="linearGradient8645"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-686">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2575" />
-      <stop
-         id="stop2577"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2579" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-768"
-       id="linearGradient8647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-768">
-      <stop
-         id="stop2583"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2585" />
-      <stop
-         id="stop2587"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3240-907"
-       id="linearGradient8649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3240-907">
-      <stop
-         style="stop-color:#565656;stop-opacity:1;"
-         offset="0"
-         id="stop2591" />
-      <stop
-         id="stop2593"
-         offset="0.5"
-         style="stop-color:#9a9a9a;stop-opacity:1;" />
-      <stop
-         style="stop-color:#545454;stop-opacity:1;"
-         offset="1"
-         id="stop2595" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3223-699"
-       id="linearGradient8651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
-       x1="30.037716"
-       y1="24.989594"
-       x2="30.037716"
-       y2="30.000141" />
-    <linearGradient
-       id="linearGradient3223-699">
-      <stop
-         id="stop2599"
-         offset="0"
-         style="stop-color:#b1b1b1;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0.5"
-         id="stop2601" />
-      <stop
-         id="stop2603"
-         offset="1"
-         style="stop-color:#8f8f8f;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3290-678"
-       id="linearGradient8653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
-       x1="9"
-       y1="29.056757"
-       x2="9"
-       y2="26.02973" />
-    <linearGradient
-       id="linearGradient3290-678">
-      <stop
-         id="stop2607"
-         offset="0"
-         style="stop-color:#ece5a5;stop-opacity:1;" />
-      <stop
-         id="stop2609"
-         offset="1"
-         style="stop-color:#fcfbf2;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3191-577"
-       id="linearGradient8655"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
-       x1="5.5178981"
-       y1="37.371799"
-       x2="9.5220556"
-       y2="41.391716" />
-    <linearGradient
-       id="linearGradient3191-577">
-      <stop
-         id="stop2613"
-         offset="0"
-         style="stop-color:#dbce48;stop-opacity:1;" />
-      <stop
-         id="stop2615"
-         offset="1"
-         style="stop-color:#c5b625;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
-       id="linearGradient3934-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4154-8"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4326"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4328"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093"
-       id="linearGradient3878"
-       xlink:href="#linearGradient3587-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,-3.4266134)" />
-    <linearGradient
-       id="linearGradient3587-6-5">
-      <stop
-         id="stop3589-9-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4357"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
-       x1="0.86849999"
-       y1="13.895414"
-       x2="0.44923753"
-       y2="28.776533" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
-       id="linearGradient4405"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4413-7"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-5-4-0-1-55">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-3-2-53-4-3-95" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-7-9-86-9-3-6" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4411-3"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       id="linearGradient3587-6-5-2">
-      <stop
-         id="stop3589-9-2-8"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient4466-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4">
-      <stop
-         id="stop3589-9-2-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="54.703121"
-       x2="-41.553459"
-       y1="2.2401412"
-       x1="-41.553459"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4483-3"
-       xlink:href="#linearGradient3587-6-5-2-4-9"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-9">
-      <stop
-         id="stop3589-9-2-8-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(13.927091,16.573387)"
-       x1="-2.4040222"
-       y1="4.4573336"
-       x2="-2.4040222"
-       y2="18.967093" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2"
-       id="linearGradient4578"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
-       id="linearGradient4580"
-       gradientUnits="userSpaceOnUse"
-       x1="209.34245"
-       y1="998.45801"
-       x2="209.34245"
-       y2="1013.451" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4359-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-6"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient4361-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient4597">
-      <stop
-         id="stop4599"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4601"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4610"
-       xlink:href="#linearGradient3587-6-5-3"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422"
-       xlink:href="#linearGradient3587-6-5-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-5">
-      <stop
-         id="stop3589-9-2-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3189"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-8">
-      <stop
-         id="stop3589-9-2-67"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3203"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
-    <linearGradient
-       id="linearGradient3120">
-      <stop
-         id="stop3122"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3124"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3207"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
-    <linearGradient
-       id="linearGradient3127">
-      <stop
-         id="stop3129"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3131"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837"
-       id="linearGradient3211"
-       xlink:href="#linearGradient3587-6-5-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
-    <linearGradient
-       id="linearGradient3134">
-      <stop
-         id="stop3136"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3138"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2409"
-       xlink:href="#linearGradient3587-6-5-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
-    <linearGradient
-       id="linearGradient3587-6-5-1">
-      <stop
-         id="stop3589-9-2-0"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-21"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="40.805084"
-       y1="5.6271191"
-       x2="40.805084"
-       y2="17.627119"
-       id="linearGradient3206"
-       xlink:href="#linearGradient3587-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-32.805085,-3.6271193)" />
-    <linearGradient
-       id="linearGradient3587-8-5">
-      <stop
-         id="stop3589-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-3-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="17.627119"
-       x2="40.805084"
-       y1="5.6271191"
-       x1="40.805084"
-       gradientTransform="translate(-32.805085,-3.6271193)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3180"
-       xlink:href="#linearGradient3587-8-5"
-       inkscape:collect="always" />
-    <linearGradient
-       x1="1.3333321"
-       y1="6.6666665"
-       x2="1.3333321"
-       y2="33.333332"
-       id="linearGradient2422-1"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
-    <linearGradient
-       id="linearGradient3587-6-5-86">
-      <stop
-         id="stop3589-9-2-65"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2427"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
-    <linearGradient
-       id="linearGradient3207-3">
-      <stop
-         id="stop3209"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3211"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2436"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
-    <linearGradient
-       id="linearGradient3214">
-      <stop
-         id="stop3216"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3218"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="11"
-       y1="6"
-       x2="11"
-       y2="17"
-       id="linearGradient2442"
-       xlink:href="#linearGradient3587-6-5-86"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
-    <linearGradient
-       id="linearGradient3221">
-      <stop
-         id="stop3223"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3225"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="1.3333321"
-       y1="4.9755898"
-       x2="1.3333321"
-       y2="37.373981"
-       id="linearGradient2422-1-0"
-       xlink:href="#linearGradient3587-6-5-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
-    <linearGradient
-       id="linearGradient3587-6-5-0">
-      <stop
-         id="stop3589-9-2-5"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042"
-       id="linearGradient3795-2"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7">
-      <stop
-         id="stop3589-9-2-2-6-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-5">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5"
-       id="linearGradient4872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
-       x1="100.77747"
-       y1="17.859186"
-       x2="100.77747"
-       y2="38.055252" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4894"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient4912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient3587-6-5-8-6">
-      <stop
-         id="stop3589-9-2-67-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-2-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4935">
-      <stop
-         id="stop4937"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4939"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4942">
-      <stop
-         id="stop4944"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4946"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8-6"
-       id="linearGradient4912-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       id="linearGradient4949">
-      <stop
-         id="stop4951"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4953"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-8"
-       id="linearGradient5021"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
-       x1="26.045763"
-       y1="9.6223383"
-       x2="26.045763"
-       y2="19.490837" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4"
-       id="linearGradient3335"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4134"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136"
-       id="linearGradient4150"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6"
-       id="linearGradient3335-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6">
-      <stop
-         id="stop3589-9-2-8-7-8"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-0"
-       id="linearGradient3335-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-0">
-      <stop
-         id="stop3589-9-2-8-7-8-7"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-4"
-       id="linearGradient3335-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.553459"
-       y2="54.703121" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-4">
-      <stop
-         id="stop3589-9-2-8-7-8-2"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-2"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-7"
-       id="linearGradient3335-7-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
-       x1="-41.553459"
-       y1="2.2401412"
-       x2="-41.755585"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-7">
-      <stop
-         id="stop3589-9-2-8-7-8-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-5"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2"
-       id="linearGradient3335-7-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2">
-      <stop
-         id="stop3589-9-2-8-7-8-77"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4136-9"
-       id="linearGradient4150-0"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="pad"
-       x1="9"
-       y1="0"
-       x2="9"
-       y2="15" />
-    <linearGradient
-       id="linearGradient4136-9">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;"
-         id="stop4138-6" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop4140-3" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
-       id="linearGradient3335-7-1-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
-       x1="-39.421574"
-       y1="-5.2547116"
-       x2="-39.421574"
-       y2="47.208389" />
-    <linearGradient
-       id="linearGradient3587-6-5-2-4-6-2-6">
-      <stop
-         id="stop3589-9-2-8-7-8-77-4"
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-0-3-4-9-3"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-10"
-       id="linearGradient4328-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       x1="8.7094374"
-       y1="1.0035814"
-       x2="8.6826077"
-       y2="16.052532" />
-    <linearGradient
-       id="linearGradient3587-6-5-10">
-      <stop
-         id="stop3589-9-2-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-4"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="16.052532"
-       x2="8.6826077"
-       y1="1.0035814"
-       x1="8.7094374"
-       gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3417"
-       xlink:href="#linearGradient3587-6-5-10"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-19"
-       id="linearGradient4326-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
-       x1="14.501121"
-       y1="-1.4095211"
-       x2="14.152531"
-       y2="20.074369" />
-    <linearGradient
-       id="linearGradient3587-6-5-19">
-      <stop
-         id="stop3589-9-2-62"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-54"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
-     id="g3743-3"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <rect
-     style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3136"
-     width="163.31035"
-     height="97.986206"
-     x="-62.896553"
-     y="-32.993103" />
-  <g
-     transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
-     id="g3743-9-4"
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-  <g
-     id="g4146">
-    <path
-       d="m 4.1179357,1.711205 c -1.1132415,0 -2.0576469,0.814147 -2.0576469,1.86482 0.0079,0.332088 0.037602,0.741596 0.2357724,1.607602 l 0,0.02144 0.021432,0.02143 c 0.063617,0.182229 0.1561942,0.28647 0.2786394,0.428695 0.1224453,0.142224 0.268425,0.30962 0.4072429,0.450128 0.016332,0.01653 0.0268,0.02677 0.042864,0.04288 0.02753,0.119804 0.060881,0.248737 0.085735,0.36439 0.066135,0.307705 0.059353,0.525608 0.042871,0.600171 C 2.6964736,7.280731 2.101329,7.480767 1.5673092,7.712932 1.2674979,7.843276 0.9962013,7.959669 0.7742571,8.098757 0.5523138,8.237846 0.3315876,8.342929 0.259846,8.65606 c -9.199e-4,0.01427 -9.199e-4,0.0286 0,0.04288 -0.070103,0.643711 -0.176148,1.590293 -0.257206,2.229209 -0.017499,0.134489 0.053382,0.276262 0.1714704,0.342955 0.9696174,0.523769 2.4590634,0.734572 3.9438235,0.72878 1.4847593,-0.0058 2.9623436,-0.228982 3.9009551,-0.72878 0.118087,-0.06669 0.1889717,-0.208466 0.1714705,-0.342955 C 8.1644805,10.728435 8.1326895,10.278091 8.1046245,9.834978 8.0765575,9.391865 8.0521945,8.955983 8.0188915,8.698939 8.0072715,8.635219 7.9771485,8.574989 7.9331545,8.527461 7.6349911,8.171408 7.1895218,7.953747 6.6685589,7.734378 6.1929506,7.534107 5.6353752,7.326131 5.082457,7.091337 5.051511,7.022397 5.020771,6.821819 5.082457,6.5126 5.099022,6.42957 5.12496,6.340639 5.14676,6.255383 5.19872,6.197183 5.23922,6.149623 5.2967968,6.083906 5.4195951,5.943745 5.551542,5.796713 5.6611711,5.655212 5.770801,5.51371 5.8604934,5.392319 5.9183771,5.226517 l 0.021432,-0.02144 C 6.1638462,4.300845 6.1639629,3.923525 6.1755816,3.597474 l 0,-0.02143 c 0,-1.050672 -0.9444033,-1.864819 -2.057647,-1.864819 z M 10.003781,-1.6024174e-5 C 8.3807203,-1.6024174e-5 7.0038161,1.186928 7.0038161,2.718703 c 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 C 7.9313481,8.119786 7.0636518,8.411419 6.2850728,8.749892 5.8479602,8.93992 5.4524208,9.10961 5.1288354,9.312386 4.8052511,9.515163 4.4834415,9.668364 4.378845,10.124877 c -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499329,1.062488 2.164718,-0.0084 4.318975,-0.333832 5.687432,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.312472,-0.937489 -0.04512,-0.100507 -0.08994,-0.392929 0,-0.84374 0.02415,-0.121051 0.06197,-0.250702 0.09375,-0.374996 0.07576,-0.08485 0.134803,-0.154188 0.218748,-0.249997 0.179035,-0.20434 0.371408,-0.418698 0.531242,-0.624992 0.159836,-0.206295 0.290604,-0.383272 0.374996,-0.624994 L 12.66,5.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 C 13.003747,1.186948 11.626846,3.9858261e-6 10.003782,3.9858261e-6 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="path5493"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2880-5-3-9-2"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 4.1179357,2.711205 c -1.1132415,0 -2.0576469,0.814147 -2.0576469,1.86482 0.0079,0.332088 0.037602,0.741596 0.2357724,1.607602 l 0,0.02144 0.021432,0.02143 c 0.063617,0.182229 0.1561942,0.28647 0.2786394,0.428695 0.1224453,0.142224 0.268425,0.30962 0.4072429,0.450128 0.016332,0.01653 0.0268,0.02677 0.042864,0.04288 0.02753,0.119804 0.060881,0.248737 0.085735,0.36439 0.066135,0.307705 0.059353,0.525608 0.042871,0.600171 C 2.6964736,8.280731 2.101329,8.480767 1.5673092,8.712932 1.2674979,8.843276 0.9962013,8.959669 0.7742571,9.098757 0.5523138,9.237846 0.3315876,9.342929 0.259846,9.65606 c -9.199e-4,0.01427 -9.199e-4,0.0286 0,0.04288 -0.070103,0.643711 -0.176148,1.590293 -0.257206,2.229209 -0.017499,0.134489 0.053382,0.276262 0.1714704,0.342955 0.9696174,0.523769 2.4590634,0.734572 3.9438235,0.72878 1.4847593,-0.0058 2.9623436,-0.228982 3.9009551,-0.72878 0.118087,-0.06669 0.1889717,-0.208466 0.1714705,-0.342955 -0.025879,-0.199714 -0.05767,-0.650058 -0.085735,-1.093171 C 8.0765575,10.391865 8.0521945,9.955983 8.0188915,9.698939 8.0072715,9.635219 7.9771485,9.574989 7.9331545,9.527461 7.6349911,9.171408 7.1895218,8.953747 6.6685589,8.734378 6.1929506,8.534107 5.6353752,8.326131 5.082457,8.091337 5.051511,8.022397 5.020771,7.821819 5.082457,7.5126 5.099022,7.42957 5.12496,7.340639 5.14676,7.255383 5.19872,7.197183 5.23922,7.149623 5.2967968,7.083906 5.4195951,6.943745 5.551542,6.796713 5.6611711,6.655212 5.770801,6.51371 5.8604934,6.392319 5.9183771,6.226517 l 0.021432,-0.02144 C 6.1638462,5.300845 6.1639629,4.923525 6.1755816,4.597474 l 0,-0.02143 c 0,-1.050672 -0.9444033,-1.864819 -2.057647,-1.864819 z M 10.003781,0.99998399 c -1.6230607,0 -2.9999649,1.18694401 -2.9999649,2.71871901 0.011519,0.48415 0.054822,1.081172 0.3437465,2.343722 l 0,0.03125 0.031247,0.03125 c 0.092751,0.265671 0.2277248,0.417644 0.406245,0.624993 0.1785202,0.207349 0.3913525,0.451395 0.5937433,0.656242 0.023812,0.0241 0.039074,0.03903 0.062494,0.06251 0.040137,0.174662 0.088761,0.362633 0.1249979,0.531244 0.096423,0.448603 0.086533,0.766283 0.062505,0.874989 -0.6974467,0.244883 -1.565143,0.536516 -2.343722,0.874989 -0.4371126,0.190028 -0.832652,0.359718 -1.1562374,0.562494 -0.3235843,0.202777 -0.6453939,0.355978 -0.7499904,0.812491 -0.00134,0.02081 -0.00134,0.04169 0,0.06251 -0.1022081,0.938467 -0.2568165,2.318487 -0.3749957,3.249962 -0.025513,0.196072 0.077829,0.402763 0.2499968,0.499994 1.4136624,0.763602 3.5852136,1.070932 5.7499329,1.062488 2.164718,-0.0084 4.318975,-0.333832 5.687432,-1.062488 0.172166,-0.09723 0.275513,-0.303922 0.249997,-0.499994 -0.03773,-0.291163 -0.08408,-0.947718 -0.124999,-1.593732 -0.04092,-0.646014 -0.07644,-1.281486 -0.124994,-1.656231 -0.01694,-0.09289 -0.06086,-0.180706 -0.125,-0.249997 -0.43471,-0.51909 -1.084186,-0.836417 -1.843728,-1.156236 -0.693418,-0.291975 -1.50634,-0.595182 -2.312472,-0.937489 -0.04512,-0.100507 -0.08994,-0.392929 0,-0.84374 0.02415,-0.121051 0.06197,-0.250702 0.09375,-0.374996 0.07576,-0.08485 0.134803,-0.154188 0.218748,-0.249997 0.179035,-0.20434 0.371408,-0.418698 0.531242,-0.624992 0.159836,-0.206295 0.290604,-0.383272 0.374996,-0.624994 L 12.66,6.093695 c 0.326637,-1.318279 0.326807,-1.868373 0.343747,-2.343723 l 0,-0.03125 c 0,-1.531774 -1.376901,-2.718718 -2.999965,-2.718718 z" />
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <g>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.1179 1.7112c-1.1132 0-2.0576 0.81415-2.0576 1.8648 0.0079 0.33209 0.037602 0.7416 0.23577 1.6076v0.02144l0.021432 0.02143c0.063617 0.18223 0.15619 0.28647 0.27864 0.4287 0.12245 0.14222 0.26842 0.30962 0.40724 0.45013 0.016332 0.01653 0.0268 0.02677 0.042864 0.04288 0.02753 0.1198 0.060881 0.24874 0.085735 0.36439 0.066135 0.3077 0.059353 0.52561 0.042871 0.60017-0.4783 0.1679-1.0735 0.368-1.6075 0.6001-0.2998 0.1304-0.5711 0.2468-0.79304 0.3859-0.22195 0.139-0.44267 0.2441-0.51441 0.5573-0.0009199 0.01427-0.0009199 0.0286 0 0.04288-0.070103 0.64371-0.17615 1.5903-0.25721 2.2292-0.017499 0.13449 0.053382 0.27626 0.17147 0.34296 0.96962 0.52377 2.4591 0.73457 3.9438 0.72878 1.4848-0.0058 2.9623-0.22898 3.901-0.72878 0.11809-0.06669 0.18897-0.20847 0.17147-0.34296-0.0259-0.2-0.0577-0.65-0.0858-1.093-0.028-0.4431-0.0524-0.879-0.0857-1.1361-0.0116-0.0637-0.0418-0.1239-0.0857-0.1714-0.2982-0.3561-0.7437-0.5738-1.2646-0.7931-0.4756-0.2003-1.0332-0.4083-1.5861-0.6431-0.031-0.0689-0.0617-0.2695 0-0.5787 0.0165-0.083 0.0425-0.172 0.0643-0.2572 0.0519-0.0582 0.0924-0.1058 0.15-0.1715 0.1228-0.1402 0.2547-0.2872 0.3644-0.4287 0.1096-0.1415 0.1993-0.2629 0.2572-0.4287l0.021432-0.02144c0.224-0.9043 0.2242-1.2816 0.2358-1.6076v-0.02143c0-1.0507-0.9444-1.8648-2.0576-1.8648zm5.8861-1.7112c-1.6233 0-3.0002 1.1869-3.0002 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.6975 0.245-1.5651 0.5366-2.3437 0.8751-0.4371 0.19-0.8327 0.3597-1.1563 0.5625-0.3235 0.2028-0.6454 0.356-0.75 0.8126-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.04512-0.10051-0.08994-0.39293 0-0.84374 0.02415-0.12105 0.06197-0.2507 0.09375-0.375 0.07576-0.08485 0.1348-0.15419 0.21875-0.25 0.17904-0.20434 0.37141-0.4187 0.53124-0.62499 0.15984-0.2063 0.2906-0.38327 0.375-0.62499l0.032-0.0315c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5319-1.377-2.7188-3-2.7188z"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.1179 2.7112c-1.1132 0-2.0576 0.81415-2.0576 1.8648 0.0079 0.33209 0.037602 0.7416 0.23577 1.6076v0.02144l0.021432 0.02143c0.063617 0.18223 0.15619 0.28647 0.27864 0.4287 0.12245 0.14222 0.26842 0.30962 0.40724 0.45013 0.016332 0.01653 0.0268 0.02677 0.042864 0.04288 0.02753 0.1198 0.060881 0.24874 0.085735 0.36439 0.066135 0.3077 0.059353 0.52561 0.042871 0.60017-0.4783 0.1679-1.0735 0.368-1.6075 0.6001-0.2998 0.1304-0.5711 0.2468-0.79304 0.3859-0.22195 0.139-0.44267 0.2441-0.51441 0.5573-0.0009199 0.01427-0.0009199 0.0286 0 0.04288-0.070103 0.64371-0.17615 1.5903-0.25721 2.2292-0.017499 0.13449 0.053382 0.27626 0.17147 0.34296 0.96962 0.52377 2.4591 0.73457 3.9438 0.72878 1.4848-0.0058 2.9623-0.22898 3.901-0.72878 0.11809-0.06669 0.18897-0.20847 0.17147-0.34296-0.025879-0.19971-0.05767-0.65006-0.085735-1.0932-0.0282-0.443-0.0526-0.879-0.0859-1.1361-0.0116-0.0637-0.0418-0.1239-0.0857-0.1714-0.2982-0.3561-0.7437-0.5738-1.2646-0.7931-0.4756-0.2003-1.0332-0.4083-1.5861-0.6431-0.031-0.0689-0.0617-0.2695 0-0.5787 0.0165-0.083 0.0425-0.172 0.0643-0.2572 0.0519-0.0582 0.0924-0.1058 0.15-0.1715 0.1228-0.1402 0.2547-0.2872 0.3644-0.4287 0.1096-0.1415 0.1993-0.2629 0.2572-0.4287l0.021432-0.02144c0.224-0.9043 0.2242-1.2816 0.2358-1.6076v-0.02143c0-1.0507-0.9444-1.8648-2.0576-1.8648zm5.8861-1.7112c-1.6231 0-3 1.1869-3 2.7187 0.011519 0.48415 0.054822 1.0812 0.34375 2.3437v0.03125l0.031247 0.03125c0.092751 0.26567 0.22772 0.41764 0.40624 0.62499s0.39135 0.4514 0.59374 0.65624c0.023812 0.0241 0.039074 0.03903 0.062494 0.06251 0.040137 0.17466 0.088761 0.36263 0.125 0.53124 0.096423 0.4486 0.086533 0.76628 0.062505 0.87499-0.69745 0.24488-1.5651 0.53652-2.3437 0.87499-0.43711 0.19003-0.83265 0.35972-1.1562 0.56249-0.32358 0.20278-0.64539 0.35598-0.74999 0.81249-0.00134 0.02081-0.00134 0.04169 0 0.06251-0.10221 0.93847-0.25682 2.3185-0.375 3.25-0.025513 0.19607 0.077829 0.40276 0.25 0.49999 1.4137 0.7636 3.5852 1.0709 5.7499 1.0625s4.319-0.33383 5.6874-1.0625c0.17217-0.09723 0.27551-0.30392 0.25-0.49999-0.03773-0.29116-0.08408-0.94772-0.125-1.5937-0.04092-0.64601-0.07644-1.2815-0.12499-1.6562-0.01694-0.09289-0.06086-0.18071-0.125-0.25-0.43471-0.51909-1.0842-0.83642-1.8437-1.1562-0.69342-0.29198-1.5063-0.59518-2.3125-0.93749-0.04512-0.10051-0.08994-0.39293 0-0.84374 0.02415-0.12105 0.06197-0.2507 0.09375-0.375 0.07576-0.08485 0.1348-0.15419 0.21875-0.25 0.17904-0.20434 0.37141-0.4187 0.53124-0.62499 0.15984-0.2063 0.2906-0.38327 0.375-0.62499l0.031-0.0313c0.32664-1.3183 0.32681-1.8684 0.34375-2.3437v-0.03125c0-1.5318-1.3769-2.7187-3-2.7187z" fill="#fff"/>
+ </g>
 </svg>
diff --git a/settings/js/log.js b/settings/js/log.js
index 81117f9e8272de09a5eb3ee4cca7b9159355005c..84f6d1aa5f3f9f6cbc58d2f8ee8134b685756657 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -55,7 +55,11 @@ OC.Log={
 			row.append(messageTd);
 
 			var timeTd=$('<td/>');
-			timeTd.text(formatDate(entry.time*1000));
+			if(isNaN(entry.time)){
+				timeTd.text(entry.time);
+			} else {
+				timeTd.text(formatDate(entry.time*1000));
+			}
 			row.append(timeTd);
 			$('#log').append(row);
 		}
diff --git a/settings/js/personal.js b/settings/js/personal.js
index d0a471e56b57b5cf8ff0cb35ad6da349804e761b..099c1426dc0aa290706390c538e1a3b6512cd2f2 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -4,16 +4,56 @@
  * See the COPYING-README file.
  */
 
+/**
+ * Post the email address change to the server.
+ */
+function changeEmailAddress(){
+    emailInfo = $('#email');
+    if (emailInfo.val() === emailInfo.defaultValue){
+        return;
+    }
+    emailInfo.defaultValue = emailInfo.val();
+    OC.msg.startSaving('#lostpassword .msg');
+    var post = $( "#lostpassword" ).serialize();
+    $.post( 'ajax/lostpassword.php', post, function(data){
+        OC.msg.finishedSaving('#lostpassword .msg', data);
+    });
+}
+
+/**
+ * Post the display name change to the server.
+ */
+function changeDisplayName(){
+    if ($('#displayName').val() !== '' ) {
+        OC.msg.startSaving('#displaynameform .msg');
+        // Serialize the data
+        var post = $( "#displaynameform" ).serialize();
+        // Ajax foo
+        $.post( 'ajax/changedisplayname.php', post, function(data){
+            if( data.status === "success" ){
+                $('#oldDisplayName').text($('#displayName').val());
+                // update displayName on the top right expand button
+                $('#expandDisplayName').text($('#displayName').val());
+            }
+            else{
+                $('#newdisplayname').val(data.data.displayName);
+            }
+            OC.msg.finishedSaving('#displaynameform .msg', data);
+        });
+        return false;
+    }
+}
+
 $(document).ready(function(){
 	$("#passwordbutton").click( function(){
-		if ($('#pass1').val() != '' && $('#pass2').val() != '') {
+		if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
 			// Serialize the data
 			var post = $( "#passwordform" ).serialize();
 			$('#passwordchanged').hide();
 			$('#passworderror').hide();
 			// Ajax foo
 			$.post( 'ajax/changepassword.php', post, function(data){
-				if( data.status == "success" ){
+				if( data.status === "success" ){
 					$('#pass1').val('');
 					$('#pass2').val('');
 					$('#passwordchanged').show();
@@ -32,57 +72,36 @@ $(document).ready(function(){
 
 	});
 
-	$("#displaynamebutton").click( function(){
-		if ($('#displayName').val() != '' ) {
-			// Serialize the data
-			var post = $( "#displaynameform" ).serialize();
-			$('#displaynamechanged').hide();
-			$('#displaynemerror').hide();
-			// Ajax foo
-			$.post( 'ajax/changedisplayname.php', post, function(data){
-				if( data.status == "success" ){
-					$('#displaynamechanged').show();
-					$('#oldDisplayName').text($('#displayName').val());
-					// update displayName on the top right expand button
-					$('#expandDisplayName').text($('#displayName').val());
-				}
-				else{
-					$('#newdisplayname').val(data.data.displayName)
-					$('#displaynameerror').html( data.data.message );
-					$('#displaynameerror').show();
-				}
-			});
-			return false;
-		} else {
-			$('#displayName').val($('#oldDisplayName').val());
-			$('#displaynamechanged').hide();
-			$('#displaynameerror').show();
-			return false;
-		}
+    $('#displayName').keyup(function(){
+        if ($('#displayName').val() !== '' ){
+            if(typeof timeout !== 'undefined'){
+                clearTimeout(timeout);
+            }
+            timeout = setTimeout('changeDisplayName()',1000);
+        }
+    });
 
-	});
 
-	$('#lostpassword #email').blur(function(event){
-		if ($(this).val() == this.defaultValue){
-			return;
-		}
-		event.preventDefault();
-		this.defaultValue = $(this).val();
-		OC.msg.startSaving('#lostpassword .msg');
-		var post = $( "#lostpassword" ).serialize();
-		$.post( 'ajax/lostpassword.php', post, function(data){
-			OC.msg.finishedSaving('#lostpassword .msg', data);
-		});
-	});
+    $('#email').keyup(function(){
+        if ($('#email').val() !== '' ){
+            if(typeof timeout !== 'undefined'){
+                clearTimeout(timeout);
+            }
+            timeout = setTimeout('changeEmailAddress()',1000);
+        }
+    });
 
 	$("#languageinput").chosen();
+	// Show only the not selectable optgroup
+	// Choosen only shows optgroup-labels if there are options in the optgroup
+	$(".languagedivider").remove();
 
 	$("#languageinput").change( function(){
 		// Serialize the data
 		var post = $( "#languageinput" ).serialize();
 		// Ajax foo
 		$.post( 'ajax/setlanguage.php', post, function(data){
-			if( data.status == "success" ){
+			if( data.status === "success" ){
 				location.reload();
 			}
 			else{
@@ -103,12 +122,12 @@ OC.msg={
 			.show();
 	},
 	finishedSaving:function(selector, data){
-		if( data.status == "success" ){
+		if( data.status === "success" ){
 			 $(selector).html( data.data.message )
 				.addClass('success')
 				.stop(true, true)
 				.delay(3000)
-				.fadeOut(600);
+				.fadeOut(900);
 		}else{
 			$(selector).html( data.data.message ).addClass('error');
 		}
diff --git a/settings/js/users.js b/settings/js/users.js
index 4a358a4392d6490d81f871fe7426bf2c10c72e82..f3fab34b090cc6cb9a97f060a925be5df1a22daa 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -19,6 +19,10 @@ function setQuota (uid, quota, ready) {
 var UserList = {
 	useUndo: true,
 	availableGroups: [],
+	offset: 30, //The first 30 users are there. No prob, if less in total.
+				//hardcoded in settings/users.php
+
+	usersToLoad: 10, //So many users will be loaded when user scrolls down
 
 	/**
 	 * @brief Initiate user deletion process in UI
@@ -192,14 +196,17 @@ var UserList = {
 			return;
 		}
 		UserList.updating = true;
-		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function (result) {
+		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad }), function (result) {
 			if (result.status === 'success') {
+				//The offset does not mirror the amount of users available,
+				//because it is backend-dependent. For correct retrieval,
+				//always the limit(requested amount of users) needs to be added.
+				UserList.offset += UserList.usersToLoad;
 				$.each(result.data, function (index, user) {
 					if($('tr[data-uid="' + user.name + '"]').length > 0) {
 						return true;
 					}
 					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
-					UserList.offset++;
 					if (index == 9) {
 						$(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 							$(this).unbind(event);
@@ -315,7 +322,6 @@ $(document).ready(function () {
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').attr('data-groups').split(', ');
-	UserList.offset = $('tbody tr').length;
 	$('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) {
 		OC.Router.registerLoadedCallback(function () {
 			UserList.update();
@@ -345,10 +351,14 @@ $(document).ready(function () {
 		input.keypress(function (event) {
 			if (event.keyCode == 13) {
 				if ($(this).val().length > 0) {
+					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
 					$.post(
 						OC.filePath('settings', 'ajax', 'changepassword.php'),
-						{username: uid, password: $(this).val()},
+						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
 						function (result) {
+							if (result.status != 'success') {
+								OC.Notification.show(t('admin', result.data.message));
+							}
 						}
 					);
 					input.blur();
@@ -362,6 +372,10 @@ $(document).ready(function () {
 			img.css('display', '');
 		});
 	});
+	$('input:password[id="recoveryPassword"]').keyup(function(event) {
+		OC.Notification.hide();
+	});
+
 	$('table').on('click', 'td.password', function (event) {
 		$(this).children('img').click();
 	});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index caf465bf672c9f10f244b8c296217fbad22e710d..a69bc9bed5aade5b376e800772bfa00b3ac034dd 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -10,7 +10,7 @@
 "Unable to delete group" => "فشل إزالة المجموعة",
 "Unable to delete user" => "فشل إزالة المستخدم",
 "Language changed" => "تم تغيير اللغة",
-"Invalid request" => "طلبك غير مفهوم",
+"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",
@@ -23,13 +23,13 @@
 "Updating...." => "جاري التحديث ...",
 "Error while updating app" => "حصل خطأ أثناء تحديث التطبيق",
 "Updated" => "تم التحديث بنجاح",
-"Saving..." => "حفظ",
+"Saving..." => "جاري الحفظ...",
 "deleted" => "تم الحذف",
 "undo" => "تراجع",
 "Unable to remove user" => "تعذر حذف المستخدم",
 "Groups" => "مجموعات",
 "Group Admin" => "مدير المجموعة",
-"Delete" => "حذف",
+"Delete" => "إلغاء",
 "add group" => "اضافة مجموعة",
 "A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
 "Error creating user" => "حصل خطأ اثناء انشاء مستخدم",
@@ -84,17 +84,14 @@
 "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" => "ابدأ خطوات بداية التشغيل من جديد",
-"Password" => "كلمات السر",
+"Password" => "كلمة المرور",
 "Your password was changed" => "لقد تم تغيير كلمة السر",
 "Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
 "Current password" => "كلمات السر الحالية",
 "New password" => "كلمات سر جديدة",
 "Change password" => "عدل كلمة السر",
 "Display Name" => "اسم الحساب",
-"Your display name was changed" => "تم تغيير اسم حسابك بنجاح",
-"Unable to change your display name" => "تعذر تغيير اسم حسابك",
-"Change display name" => "تغيير اسم الحساب",
-"Email" => "العنوان البريدي",
+"Email" => "البريد الإلكترونى",
 "Your email address" => "عنوانك البريدي",
 "Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور",
 "Language" => "اللغة",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index b096fb902f6b155a82f372e5af918239e0b2afb3..e5cc8bde398efcf2a251a9ab7ab15cb8a45b45a0 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -2,10 +2,13 @@
 "Authentication error" => "Възникна проблем с идентификацията",
 "Group already exists" => "Групата вече съществува",
 "Unable to add group" => "Невъзможно добавяне на група",
+"Email saved" => "Email адреса е записан",
+"Invalid email" => "Невалиден Email адрес",
 "Unable to delete group" => "Невъзможно изтриване на група",
 "Unable to delete user" => "Невъзможно изтриване на потребител",
 "Language changed" => "Езикът е променен",
 "Invalid request" => "Невалидна заявка",
+"Update to {appversion}" => "Обновяване до {appversion}",
 "Disable" => "Изключено",
 "Enable" => "Включено",
 "Please wait...." => "Моля почакайте....",
@@ -17,8 +20,11 @@
 "undo" => "възтановяване",
 "Groups" => "Групи",
 "Delete" => "Изтриване",
+"add group" => "нова група",
 "__language_name__" => "__language_name__",
 "Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
+"Cron" => "Крон",
+"Sharing" => "Споделяне",
 "More" => "Още",
 "Less" => "По-малко",
 "Version" => "Версия",
@@ -41,6 +47,7 @@
 "Display Name" => "Екранно име",
 "Email" => "E-mail",
 "Your email address" => "Вашия email адрес",
+"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
 "Language" => "Език",
 "Help translate" => "Помогнете с превода",
 "WebDAV" => "WebDAV",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 0f2799d9f3800629d53ff9c244b15101567a0524..a1e724aa96738a9d6cd01334f72a1dcd9da14872 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -9,7 +9,7 @@
 "Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
 "Unable to delete user" => "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
 "Language changed" => "ভাষা পরিবর্তন করা হয়েছে",
-"Invalid request" => "অনুরোধটি যথাযথ নয়",
+"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 গোষ্ঠী থেকে ব্যবহারকারীকে অপসারণ করা সম্ভব হলো না",
@@ -20,7 +20,7 @@
 "undo" => "ক্রিয়া প্রত্যাহার",
 "Groups" => "গোষ্ঠীসমূহ",
 "Group Admin" => "গোষ্ঠী প্রশাসক",
-"Delete" => "মুছে ফেল",
+"Delete" => "মুছে",
 "__language_name__" => "__language_name__",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
 "More" => "বেশী",
@@ -47,7 +47,7 @@
 "Current password" => "বর্তমান কূটশব্দ",
 "New password" => "নতুন কূটশব্দ",
 "Change password" => "কূটশব্দ পরিবর্তন করুন",
-"Email" => "ই-মেইল ",
+"Email" => "ইমেইল",
 "Your email address" => "আপনার ই-মেইল ঠিকানা",
 "Fill in an email address to enable password recovery" => "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন",
 "Language" => "ভাষা",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 6fd19a6c88318f66e5b4fd1593f82f76db39f10f..769c25d7bffedb2a217a42a4a5b94531f6213d25 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Authentication error" => "Error d'autenticació",
+"Your display name has been changed." => "El nom a mostrar ha canviat.",
 "Unable to change display name" => "No s'ha pogut canviar el nom a mostrar",
 "Group already exists" => "El grup ja existeix",
 "Unable to add group" => "No es pot afegir el grup",
@@ -10,26 +11,26 @@
 "Unable to delete group" => "No es pot eliminar el grup",
 "Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
-"Invalid request" => "Sol.licitud no vàlida",
+"Invalid request" => "Sol·licitud no vàlida",
 "Admins can't remove themself from the admin group" => "Els administradors no es poden eliminar del grup admin",
 "Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
 "Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
 "Couldn't update app." => "No s'ha pogut actualitzar l'aplicació.",
 "Update to {appversion}" => "Actualitza a {appversion}",
 "Disable" => "Desactiva",
-"Enable" => "Activa",
+"Enable" => "Habilita",
 "Please wait...." => "Espereu...",
 "Error" => "Error",
 "Updating...." => "Actualitzant...",
 "Error while updating app" => "Error en actualitzar l'aplicació",
 "Updated" => "Actualitzada",
-"Saving..." => "S'està desant...",
+"Saving..." => "Desant...",
 "deleted" => "esborrat",
 "undo" => "desfés",
 "Unable to remove user" => "No s'ha pogut eliminar l'usuari",
 "Groups" => "Grups",
 "Group Admin" => "Grup Admin",
-"Delete" => "Suprimeix",
+"Delete" => "Esborra",
 "add group" => "afegeix grup",
 "A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
 "Error creating user" => "Error en crear l'usuari",
@@ -91,9 +92,6 @@
 "New password" => "Contrasenya nova",
 "Change password" => "Canvia la contrasenya",
 "Display Name" => "Nom a mostrar",
-"Your display name was changed" => "El vostre nom a mostrar ha canviat",
-"Unable to change your display name" => "No s'ha pogut canviar el vostre nom a mostrar",
-"Change display name" => "Canvia el nom a mostrar",
 "Email" => "Correu electrònic",
 "Your email address" => "Correu electrònic",
 "Fill in an email address to enable password recovery" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
 "Login Name" => "Nom d'accés",
 "Create" => "Crea",
+"Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
 "Default Storage" => "Emmagatzemament per defecte",
 "Unlimited" => "Il·limitat",
 "Other" => "Un altre",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 6e9d4e884d4735fdbea292922360e9fc3b898856..6fec132701b149639e29d0ec316b52eaf2379d97 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nelze načíst seznam z App Store",
 "Authentication error" => "Chyba ověření",
+"Your display name has been changed." => "Vaše zobrazované jméno bylo změněno.",
 "Unable to change display name" => "Nelze změnit zobrazované jméno",
 "Group already exists" => "Skupina již existuje",
 "Unable to add group" => "Nelze přidat skupinu",
@@ -91,9 +92,6 @@
 "New password" => "Nové heslo",
 "Change password" => "Změnit heslo",
 "Display Name" => "Zobrazované jméno",
-"Your display name was changed" => "Vaše zobrazované jméno bylo změněno",
-"Unable to change your display name" => "Nelze změnit vaše zobrazované jméno",
-"Change display name" => "Změnit zobrazované jméno",
 "Email" => "E-mail",
 "Your email address" => "Vaše e-mailová adresa",
 "Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte adresu e-mailu",
@@ -105,7 +103,7 @@
 "Create" => "Vytvořit",
 "Default Storage" => "Výchozí úložiště",
 "Unlimited" => "NeomezenÄ›",
-"Other" => "Jiná",
+"Other" => "Jiný",
 "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
new file mode 100644
index 0000000000000000000000000000000000000000..7ffcbdb45b5e7f0c776cb47a890e5c082ee6412b
--- /dev/null
+++ b/settings/l10n/cy_GB.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"Authentication error" => "Gwall dilysu",
+"Invalid request" => "Cais annilys",
+"Error" => "Gwall",
+"Saving..." => "Yn cadw...",
+"undo" => "dadwneud",
+"Groups" => "Grwpiau",
+"Delete" => "Dileu",
+"Security Warning" => "Rhybudd Diogelwch",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
+"Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+"Password" => "Cyfrinair",
+"New password" => "Cyfrinair newydd",
+"Email" => "E-bost",
+"Other" => "Arall"
+);
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index e74bf16fd549269bdacc3972c6850bb58fa7e9cd..a01a90337daf907b134551168a31fc167484e2b6 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Authentication error" => "Adgangsfejl",
+"Your display name has been changed." => "Dit skærmnavn blev ændret.",
 "Unable to change display name" => "Kunne ikke skifte skærmnavn",
 "Group already exists" => "Gruppen findes allerede",
 "Unable to add group" => "Gruppen kan ikke oprettes",
@@ -83,18 +84,15 @@
 "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ørsel Guiden igen",
+"Show First Run Wizard again" => "Vis Første Kørsels Guiden igen.",
 "Password" => "Kodeord",
 "Your password was changed" => "Din adgangskode blev ændret",
 "Unable to change your password" => "Ude af stand til at ændre dit kodeord",
 "Current password" => "Nuværende adgangskode",
-"New password" => "Ny adgangskode",
+"New password" => "Nyt kodeord",
 "Change password" => "Skift kodeord",
 "Display Name" => "Skærmnavn",
-"Your display name was changed" => "Dit skærmnavn blev ændret",
-"Unable to change your display name" => "Kunne ikke skifte dit skærmnavn",
-"Change display name" => "Skift skærmnavn",
-"Email" => "Email",
+"Email" => "E-mail",
 "Your email address" => "Din emailadresse",
 "Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
 "Language" => "Sprog",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index cb7d08cba9569f455c855920072f794d2a924d2d..2cf828e73426e95b52b1ebfdf61f514adb6c1970 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Fehler bei der Anmeldung",
+"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
 "Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
 "Group already exists" => "Gruppe existiert bereits",
 "Unable to add group" => "Gruppe konnte nicht angelegt werden",
@@ -10,7 +11,7 @@
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
-"Invalid request" => "Ungültige Anfrage",
+"Invalid request" => "Fehlerhafte Anfrage",
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
@@ -39,30 +40,30 @@
 "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." => "Dein Datenverzeichnis und Deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass Du Deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass Du Dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
 "Locale not working" => "Ländereinstellung funktioniert nicht",
 "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." => "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf Deinem System zu installieren.",
 "Internet connection not working" => "Keine Netzwerkverbindung",
-"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." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren wenn Du alle Funktionen von ownCloud nutzen möchtest.",
+"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." => "Dieser ownCloud Server hat keine funktionierende Netzwerkverbindung. Dies bedeutet das einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Netzwerkverbindung für diesen Server zu aktivieren, wenn Du alle Funktionen von ownCloud nutzen möchtest.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php ist an einem Webcron-Service registriert. Die cron.php Seite wird einmal pro Minute über http abgerufen.",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Nutze den Cron Systemdienst. Rufe die Datei cron.php im owncloud Ordner einmal pro Minute über einen Cronjob auf.",
 "Sharing" => "Teilen",
 "Enable Share API" => "Aktiviere Sharing-API",
-"Allow apps to use the Share API" => "Erlaube Apps die Nutzung der Share-API",
-"Allow links" => "Erlaube Links",
-"Allow users to share items to the public with links" => "Erlaube Benutzern, Inhalte über öffentliche Links zu teilen",
-"Allow resharing" => "Erlaube erneutes Teilen",
-"Allow users to share items shared with them again" => "Erlaube Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
-"Allow users to share with anyone" => "Erlaube Benutzern, mit jedem zu teilen",
-"Allow users to only share with users in their groups" => "Erlaube Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
+"Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
+"Allow links" => "Erlaubt Links",
+"Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
+"Allow resharing" => "Erlaubt erneutes Teilen",
+"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
+"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Erzwingt die Verwendung einer verschlüsselten Verbindung",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde Dich über eine HTTPS Verbindung mit diesem ownCloud Server um diese Einstellung zu ändern",
 "Log" => "Log",
 "Log level" => "Loglevel",
 "More" => "Mehr",
@@ -91,9 +92,6 @@
 "New password" => "Neues Passwort",
 "Change password" => "Passwort ändern",
 "Display Name" => "Anzeigename",
-"Your display name was changed" => "Dein Anzeigename wurde geändert",
-"Unable to change your display name" => "Das Ändern deines Anzeigenamens ist nicht möglich",
-"Change display name" => "Anzeigenamen ändern",
 "Email" => "E-Mail",
 "Your email address" => "Deine E-Mail-Adresse",
 "Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index d6e068059b5bace62cc0a206e1c3fa04f314a8c8..f7f532397497feb80e9086aefca41bdafd326e76 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
-"Authentication error" => "Fehler bei der Anmeldung",
+"Authentication error" => "Authentifizierungs-Fehler",
+"Your display name has been changed." => "Dein Anzeigename ist geändert worden.",
 "Unable to change display name" => "Das Ändern des Anzeigenamens ist nicht möglich",
 "Group already exists" => "Die Gruppe existiert bereits",
 "Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
@@ -10,7 +11,7 @@
 "Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
 "Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
-"Invalid request" => "Ungültige Anfrage",
+"Invalid request" => "Ungültige Anforderung",
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
@@ -39,12 +40,12 @@
 "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." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Internet erreichbar. Die von ownCloud bereitgestellte .htaccess Datei funktioniert nicht. Wir empfehlen Ihnen dringend, Ihren Webserver so zu konfigurieren, dass das Datenverzeichnis nicht mehr über das Internet erreichbar ist. Alternativ können Sie auch das Datenverzeichnis aus dem Dokumentenverzeichnis des Webservers verschieben.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Instalationsanleitungen</a>.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
 "Locale not working" => "Die Lokalisierung funktioniert nicht",
 "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." => "Dieser ownCloud-Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren.",
-"Internet connection not working" => "Keine Netzwerkverbindung",
+"Internet connection not working" => "Keine Internetverbindung",
 "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." => "Dieser ownCloud-Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungs-E-Mails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen von ownCloud nutzen wollen.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
@@ -55,10 +56,10 @@
 "Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
-"Allow resharing" => "Erlaube weiterverteilen",
+"Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
-"Allow users to share with anyone" => "Erlaube Benutzern, mit jedem zu teilen",
-"Allow users to only share with users in their groups" => "Erlaube Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
+"Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
+"Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung mit ownCloud zu verbinden.",
@@ -91,9 +92,6 @@
 "New password" => "Neues Passwort",
 "Change password" => "Passwort ändern",
 "Display Name" => "Anzeigename",
-"Your display name was changed" => "Ihr Anzeigename wurde geändert",
-"Unable to change your display name" => "Das Ändern Ihres Anzeigenamens ist nicht möglich",
-"Change display name" => "Anzeigenamen ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
 "Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
@@ -102,7 +100,8 @@
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
 "Login Name" => "Loginname",
-"Create" => "Anlegen",
+"Create" => "Erstellen",
+"Admin Recovery Password" => "Admin-Paswort-Wiederherstellung",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 9dfe20ae2899f7c1d34bcd308553b832903578f4..3558ae729888146d5068c5041af0159be8a35c41 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.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" => "Αδυναμία προσθήκης ομάδας",
@@ -23,7 +24,7 @@
 "Updating...." => "Ενημέρωση...",
 "Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
 "Updated" => "Ενημερώθηκε",
-"Saving..." => "Αποθήκευση...",
+"Saving..." => "Γίνεται αποθήκευση...",
 "deleted" => "διαγράφηκε",
 "undo" => "αναίρεση",
 "Unable to remove user" => "Αδυναμία αφαίρεση χρήστη",
@@ -91,10 +92,7 @@
 "New password" => "Νέο συνθηματικό",
 "Change password" => "Αλλαγή συνθηματικού",
 "Display Name" => "Όνομα εμφάνισης",
-"Your display name was changed" => "Το όνομα εμφάνισής σας άλλαξε",
-"Unable to change your display name" => "Δεν ήταν δυνατή η αλλαγή του ονόματος εμφάνισής σας",
-"Change display name" => "Αλλαγή ονόματος εμφάνισης",
-"Email" => "Email",
+"Email" => "Ηλ. ταχυδρομείο",
 "Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
 "Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
 "Language" => "Γλώσσα",
@@ -105,7 +103,7 @@
 "Create" => "Δημιουργία",
 "Default Storage" => "Προκαθορισμένη Αποθήκευση ",
 "Unlimited" => "Απεριόριστο",
-"Other" => "Άλλα",
+"Other" => "Άλλο",
 "Storage" => "Αποθήκευση",
 "change display name" => "αλλαγή ονόματος εμφάνισης",
 "set new password" => "επιλογή νέου κωδικού",
diff --git a/settings/l10n/en@pirate.php b/settings/l10n/en@pirate.php
new file mode 100644
index 0000000000000000000000000000000000000000..482632f3fdab19ae3bd7efb9a1ed366c0f00ac9c
--- /dev/null
+++ b/settings/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Passcode"
+);
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 732a5d30fcea6f7da830d49beebf30cdbbdc4235..9fd1d5b320600b282116c4e53963809073124299 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -24,6 +24,18 @@
 "Delete" => "Forigi",
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
+"Cron" => "Cron",
+"Sharing" => "Kunhavigo",
+"Enable Share API" => "Kapabligi API-on por Kunhavigo",
+"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
+"Allow links" => "Kapabligi ligilojn",
+"Allow users to share items to the public with links" => "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile",
+"Allow resharing" => "Kapabligi rekunhavigon",
+"Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
+"Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
+"Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
+"Log" => "Protokolo",
+"Log level" => "Registronivelo",
 "More" => "Pli",
 "Less" => "Malpli",
 "Version" => "Eldono",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index a1d03ae84056715a28f25b150d57019f50a62caf..137d3c8aff72bb3e51753d9d8b083077b887ef8b 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,55 +1,56 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
-"Unable to change display name" => "Incapaz de cambiar el nombre",
+"Your display name has been changed." => "Su nombre fue cambiado.",
+"Unable to change display name" => "No se pudo cambiar el nombre",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No se pudo añadir el grupo",
-"Could not enable app. " => "No puedo habilitar la app.",
-"Email saved" => "Correo guardado",
+"Could not enable app. " => "No puedo habilitar la aplicación.",
+"Email saved" => "E-mail guardado",
 "Invalid email" => "Correo no válido",
 "Unable to delete group" => "No se pudo eliminar el grupo",
 "Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
-"Invalid request" => "Solicitud no válida",
+"Invalid request" => "Petición no válida",
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
-"Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
-"Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
-"Couldn't update app." => "No se puedo actualizar la aplicacion.",
+"Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s",
+"Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s",
+"Couldn't update app." => "No se pudo actualizar la aplicacion.",
 "Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
-"Please wait...." => "Espere por favor....",
+"Please wait...." => "Espere, por favor....",
 "Error" => "Error",
 "Updating...." => "Actualizando....",
-"Error while updating app" => "Error mientras se actualizaba",
+"Error while updating app" => "Error mientras se actualizaba la aplicación",
 "Updated" => "Actualizado",
 "Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
-"Unable to remove user" => "No se puede quitar el usuario",
+"Unable to remove user" => "No se puede eliminar el usuario",
 "Groups" => "Grupos",
-"Group Admin" => "Grupo admin",
+"Group Admin" => "Grupo administrador",
 "Delete" => "Eliminar",
-"add group" => "Añadir Grupo",
-"A valid username must be provided" => "Se debe usar un nombre de usuario  valido",
+"add group" => "añadir Grupo",
+"A valid username must be provided" => "Se debe usar un nombre de usuario  válido",
 "Error creating user" => "Error al crear usuario",
 "A valid password must be provided" => "Se debe usar una contraseña valida",
 "__language_name__" => "Castellano",
 "Security Warning" => "Advertencia de seguridad",
-"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." => "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.",
-"Setup Warning" => "Advertencia de Configuración",
+"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." => "Su directorio de datos y sus archivos son probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Le recomendamos encarecidamente que configure su servidor web de manera que el directorio de datos no esté accesible, o mueva el directorio de datos fuera del documento raíz de su servidor web.",
+"Setup Warning" => "Advertencia de configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
 "Module 'fileinfo' missing" => "Modulo 'fileinfo' perdido",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Sugerimos habilitar este modulo para tener mejorres resultados con la detección mime-type",
-"Locale not working" => "Configuración regional no está funcionando",
-"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." => "Este servidor ownCloud no puede establecer la configuración regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar %s.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
+"Locale not working" => "La configuración regional no está funcionando",
+"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." => "Este servidor ownCloud no puede establecer la configuración regional a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos. Le recomendamos que instale los paquetes requeridos en su sistema para soportar el %s.",
 "Internet connection not working" => "La conexion a internet no esta funcionando",
-"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." => "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como montar almacenamiento externo, notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionaran. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a internet para este servidor si quiere tener todas las caracteristicas de ownCloud.",
+"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." => "Este servidor ownCloud no tiene conexion de internet. Esto quiere decir que algunas caracteristicas como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o la instalacion de apps de terceros no funcionarán. Es posible que no pueda acceder remotamente a los archivos ni enviar notificaciones por correo. Sugerimos habilitar la conexión a Internet para este servidor si quiere disfrutar de todas las características de ownCloud.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php es un sistema webcron registrado. Llame a la página cron.php en la raíz de owncloud una vez por minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilizar el servicio cron del sistema. Llame al archivo cron.php en la carpeta de owncloud a través de un cronjob del sistema una vez por minuto.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php es un sistema webcron registrado. Llama a la página cron.php en la raíz de owncloud una vez por minuto sobre http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utilizar el servicio cron del sistema. Llama al archivo cron.php en la carpeta de owncloud a través de un cronjob del sistema una vez por minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Activar API de Compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
@@ -57,17 +58,17 @@
 "Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces",
 "Allow resharing" => "Permitir re-compartición",
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos",
-"Allow users to share with anyone" => "Permitir a los usuarios compartir con todos",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con todo el mundo",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
-"Enforces the clients to connect to ownCloud via an encrypted connection." => "Forzar la conexión de los clientes a ownCloud con una conexión encriptada.",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Fuerza la conexión de los clientes a ownCloud con una conexión cifrada.",
 "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Por favor, conecte esta instancia de ownCloud vía HTTPS para activar o desactivar la aplicación de SSL.",
-"Log" => "Historial",
-"Log level" => "Nivel de Historial",
+"Log" => "Registro",
+"Log level" => "Nivel de registro",
 "More" => "Más",
 "Less" => "Menos",
-"Version" => "Version",
+"Version" => "Versión",
 "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>." => "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>.",
 "Add your App" => "Añade tu aplicación",
 "More Apps" => "Más aplicaciones",
@@ -75,38 +76,36 @@
 "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
 "Update" => "Actualizar",
-"User Documentation" => "Documentación del usuario",
-"Administrator Documentation" => "Documentación del adminsitrador",
+"User Documentation" => "Documentación de usuario",
+"Administrator Documentation" => "Documentación de adminstrador",
 "Online Documentation" => "Documentación en linea",
 "Forum" => "Foro",
-"Bugtracker" => "Rastreador de Bugs",
-"Commercial Support" => "Soporte Comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de <strong>%s</strong> disponibles",
-"Get the apps to sync your files" => "Obtener las apps para sincronizar sus archivos",
+"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",
 "Password" => "Contraseña",
 "Your password was changed" => "Su contraseña ha sido cambiada",
-"Unable to change your password" => "No se ha podido cambiar tu contraseña",
+"Unable to change your password" => "No se ha podido cambiar su contraseña",
 "Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña:",
+"New password" => "Nueva contraseña",
 "Change password" => "Cambiar contraseña",
 "Display Name" => "Nombre a mostrar",
-"Your display name was changed" => "Su nombre fue cambiado",
-"Unable to change your display name" => "Incapaz de cambiar su nombre",
-"Change display name" => "Cambiar nombre",
-"Email" => "Correo electrónico",
-"Your email address" => "Tu dirección de correo",
-"Fill in an email address to enable password recovery" => "Escribe una dirección de correo electrónico para restablecer la contraseña",
+"Email" => "E-mail",
+"Your email address" => "Su dirección de correo",
+"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
 "Language" => "Idioma",
-"Help translate" => "Ayúdanos a traducir",
+"Help translate" => "Ayúdnos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
-"Default Storage" => "Almacenamiento Predeterminado",
+"Admin Recovery Password" => "Recuperación de la contraseña de administración",
+"Default Storage" => "Almacenamiento predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
-"Storage" => "Alamacenamiento",
+"Storage" => "Almacenamiento",
 "change display name" => "Cambiar nombre a mostrar",
 "set new password" => "Configurar nueva contraseña",
 "Default" => "Predeterminado"
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index a1be54be1c4e5208861ed5410d44d02a018fbde7..f7eb7dd5c2d3552f8438d77c976529600787357a 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
+"Your display name has been changed." => "El nombre mostrado fue cambiado",
 "Unable to change display name" => "No fue posible cambiar el nombre mostrado",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
@@ -10,7 +11,7 @@
 "Unable to delete group" => "No fue posible eliminar el grupo",
 "Unable to delete user" => "No fue posible eliminar el usuario",
 "Language changed" => "Idioma cambiado",
-"Invalid request" => "Solicitud no válida",
+"Invalid request" => "Pedido no válido",
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a ellos mismos del grupo administrador. ",
 "Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
 "Unable to remove user from group %s" => "No es posible eliminar al usuario del grupo %s",
@@ -91,10 +92,7 @@
 "New password" => "Nueva contraseña:",
 "Change password" => "Cambiar contraseña",
 "Display Name" => "Nombre a mostrar",
-"Your display name was changed" => "El nombre mostrado fue cambiado",
-"Unable to change your display name" => "No fue posible cambiar tu nombre",
-"Change display name" => "Cambiar nombre",
-"Email" => "Correo electrónico",
+"Email" => "Correo Electrónico",
 "Your email address" => "Tu dirección de e-mail",
 "Fill in an email address to enable password recovery" => "Escribí una dirección de correo electrónico para restablecer la contraseña",
 "Language" => "Idioma",
@@ -105,7 +103,7 @@
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
-"Other" => "Otro",
+"Other" => "Otros",
 "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 b21b55f5cac2af1ff816cda37d101cdef59228a6..8a9e237e1208ae5c19f195eaff44846345f0c463 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,14 +1,15 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
+"Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaõnnestus",
 "Authentication error" => "Autentimise viga",
-"Unable to change display name" => "Ei saa muuta kuvatavat nime",
+"Your display name has been changed." => "Sinu näidatav nimi on muudetud.",
+"Unable to change display name" => "Ei saa muuta näidatavat nime",
 "Group already exists" => "Grupp on juba olemas",
 "Unable to add group" => "Keela grupi lisamine",
 "Could not enable app. " => "Rakenduse sisselülitamine ebaõnnestus.",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
-"Unable to delete group" => "Keela grupi kustutamine",
-"Unable to delete user" => "Keela kasutaja kustutamine",
+"Unable to delete group" => "Grupi kustutamine ebaõnnestus",
+"Unable to delete user" => "Kasutaja kustutamine ebaõnnestus",
 "Language changed" => "Keel on muudetud",
 "Invalid request" => "Vigane päring",
 "Admins can't remove themself from the admin group" => "Administraatorid ei saa ise end eemaldada admin grupist",
@@ -26,7 +27,7 @@
 "Saving..." => "Salvestamine...",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
-"Unable to remove user" => "Ei suuda kustutada kasutajat",
+"Unable to remove user" => "Kasutaja eemaldamine ebaõnnestus",
 "Groups" => "Grupid",
 "Group Admin" => "Grupi admin",
 "Delete" => "Kustuta",
@@ -80,7 +81,7 @@
 "Online Documentation" => "Online dokumentatsioon",
 "Forum" => "Foorum",
 "Bugtracker" => "Vigade nimekiri",
-"Commercial Support" => "Tasuine kasutajatugi",
+"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",
@@ -91,9 +92,6 @@
 "New password" => "Uus parool",
 "Change password" => "Muuda parooli",
 "Display Name" => "Näidatav nimi",
-"Your display name was changed" => "Sinu kuvatav nimi muutus",
-"Unable to change your display name" => "Ei suuda muuta kuvatavat nime",
-"Change display name" => "Muuda näidatavat nime",
 "Email" => "E-post",
 "Your email address" => "Sinu e-posti aadress",
 "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga",
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
+"Admin Recovery Password" => "Admin taasteparool",
 "Default Storage" => "Vaikimisi maht",
 "Unlimited" => "Piiramatult",
 "Other" => "Muu",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index ed3500c5b7a4594c10f54a870d12102a7790b780..9982e9af9a03adb9246f14e31fc8f0342089579e 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -10,7 +10,7 @@
 "Unable to delete group" => "Ezin izan da taldea ezabatu",
 "Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
-"Invalid request" => "Baliogabeko eskaria",
+"Invalid request" => "Baliogabeko eskaera",
 "Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
 "Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
 "Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
@@ -91,10 +91,7 @@
 "New password" => "Pasahitz berria",
 "Change password" => "Aldatu pasahitza",
 "Display Name" => "Bistaratze Izena",
-"Your display name was changed" => "Zure bistaratze izena aldatu da",
-"Unable to change your display name" => "Ezin izan da zure bistaratze izena aldatu",
-"Change display name" => "Aldatu bistaratze izena",
-"Email" => "E-Posta",
+"Email" => "E-posta",
 "Your email address" => "Zure e-posta",
 "Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
 "Language" => "Hizkuntza",
@@ -105,7 +102,7 @@
 "Create" => "Sortu",
 "Default Storage" => "Lehenetsitako Biltegiratzea",
 "Unlimited" => "Mugarik gabe",
-"Other" => "Besteak",
+"Other" => "Bestelakoa",
 "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 8a097d64b0a6c8e894013b036401d04e13215158..1abb70f27a639a6b7a965ff14a69b3ab5928a033 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -10,7 +10,7 @@
 "Unable to delete group" => "حذف گروه امکان پذیر نیست",
 "Unable to delete user" => "حذف کاربر امکان پذیر نیست",
 "Language changed" => "زبان تغییر کرد",
-"Invalid request" => "درخواست غیر قابل قبول",
+"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 نیست",
@@ -23,13 +23,13 @@
 "Updating...." => "در حال بروز رسانی...",
 "Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
 "Updated" => "بروز رسانی انجام شد",
-"Saving..." => "درحال ذخیره ...",
+"Saving..." => "در حال ذخیره سازی...",
 "deleted" => "حذف شده",
 "undo" => "بازگشت",
 "Unable to remove user" => "حذف کاربر امکان پذیر نیست",
 "Groups" => "گروه ها",
 "Group Admin" => "گروه مدیران",
-"Delete" => "پاک کردن",
+"Delete" => "حذف",
 "add group" => "افزودن گروه",
 "A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
 "Error creating user" => "خطا در ایجاد کاربر",
@@ -58,6 +58,7 @@
 "Security" => "امنیت",
 "Enforce HTTPS" => "وادار کردن HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "وادار کردن مشتریان برای ارتباط با ownCloud از طریق رمزگذاری ارتباط",
+"Log" => "کارنامه",
 "More" => "بیش‌تر",
 "Less" => "کم‌تر",
 "Version" => "نسخه",
@@ -84,10 +85,7 @@
 "New password" => "گذرواژه جدید",
 "Change password" => "تغییر گذر واژه",
 "Display Name" => "نام نمایشی",
-"Your display name was changed" => "نام نمایشی شما تغییر یافت",
-"Unable to change your display name" => "امکان تغییر نام نمایشی شما وجود ندارد",
-"Change display name" => "تغییر نام نمایشی",
-"Email" => "پست الکترونیکی",
+"Email" => "ایمیل",
 "Your email address" => "پست الکترونیکی شما",
 "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Language" => "زبان",
@@ -97,7 +95,7 @@
 "Create" => "ایجاد کردن",
 "Default Storage" => "ذخیره سازی پیش فرض",
 "Unlimited" => "نامحدود",
-"Other" => "سایر",
+"Other" => "دیگر",
 "Storage" => "حافظه",
 "change display name" => "تغییر نام نمایشی",
 "set new password" => "تنظیم کلمه عبور جدید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 74a8157a7f689803161ee6e87045034ea35d01f6..f2d7d333589cadc8e3bfbe04bafc8d5f39325fbf 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
-"Authentication error" => "Todennusvirhe",
+"Authentication error" => "Tunnistautumisvirhe",
+"Your display name has been changed." => "Näyttönimesi on muutettu.",
 "Unable to change display name" => "Näyttönimen muuttaminen epäonnistui",
 "Group already exists" => "Ryhmä on jo olemassa",
 "Unable to add group" => "Ryhmän lisäys epäonnistui",
@@ -78,10 +79,7 @@
 "New password" => "Uusi salasana",
 "Change password" => "Vaihda salasana",
 "Display Name" => "Näyttönimi",
-"Your display name was changed" => "Näyttönimesi muutettiin",
-"Unable to change your display name" => "Näyttönimen muuttaminen epäonnistui",
-"Change display name" => "Muuta näyttönimeä",
-"Email" => "Sähköposti",
+"Email" => "Sähköpostiosoite",
 "Your email address" => "Sähköpostiosoitteesi",
 "Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
 "Language" => "Kieli",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index efc2de893d829c5a76112403bcb1a258ef04d766..0067236bad1a74dff94918fc1210fb0feb65c125 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Authentication error" => "Erreur d'authentification",
+"Your display name has been changed." => "Votre nom d'affichage a bien été modifié.",
 "Unable to change display name" => "Impossible de modifier le nom d'affichage",
 "Group already exists" => "Ce groupe existe déjà",
 "Unable to add group" => "Impossible d'ajouter le groupe",
@@ -23,7 +24,7 @@
 "Updating...." => "Mise à jour...",
 "Error while updating app" => "Erreur lors de la mise à jour de l'application",
 "Updated" => "Mise à jour effectuée avec succès",
-"Saving..." => "Sauvegarde...",
+"Saving..." => "Enregistrement...",
 "deleted" => "supprimé",
 "undo" => "annuler",
 "Unable to remove user" => "Impossible de retirer l'utilisateur",
@@ -91,10 +92,7 @@
 "New password" => "Nouveau mot de passe",
 "Change password" => "Changer de mot de passe",
 "Display Name" => "Nom affiché",
-"Your display name was changed" => "Votre nom d'affichage a bien été modifié",
-"Unable to change your display name" => "Impossible de modifier votre nom d'affichage",
-"Change display name" => "Changer le nom affiché",
-"Email" => "E-mail",
+"Email" => "Adresse mail",
 "Your email address" => "Votre adresse e-mail",
 "Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
 "Language" => "Langue",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index f7472fd872ebfc62f618572619c915d3ab5ebc8a..05f3dc07c4a64db23ac8a098f4a9bedb3ab24a5a 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticación",
+"Your display name has been changed." => "O seu nome visíbel foi cambiado",
 "Unable to change display name" => "Non é posíbel cambiar o nome visíbel",
 "Group already exists" => "O grupo xa existe",
 "Unable to add group" => "Non é posíbel engadir o grupo",
@@ -49,7 +50,7 @@
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está rexistrado nun servizo de WebCron. Chame á página cron.php na raíz ownCloud unha vez por minuto a través de HTTP.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no catfaol owncloud a través dun sistema de cronjob unna vez por minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Use o servizo de sistema cron. Chame ao ficheiro cron.php no cartafol owncloud a través dun sistema de cronjob unha vez por minuto.",
 "Sharing" => "Compartindo",
 "Enable Share API" => "Activar o API para compartir",
 "Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
@@ -91,9 +92,6 @@
 "New password" => "Novo contrasinal",
 "Change password" => "Cambiar o contrasinal",
 "Display Name" => "Amosar o nome",
-"Your display name was changed" => "O seu nome visíbel foi cambiado",
-"Unable to change your display name" => "Non é posíbel cambiar o seu nome visíbel",
-"Change display name" => "Cambiar o nome visíbel",
 "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",
@@ -103,6 +101,7 @@
 "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",
 "Default Storage" => "Almacenamento predeterminado",
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 2e208b45763d89712c3395abf494a19770f31703..5aeba49dcf7845a621da12fdf99a5cd5eff201d7 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -14,9 +14,9 @@
 "Unable to add user to group %s" => "לא ניתן להוסיף משתמש לקבוצה %s",
 "Unable to remove user from group %s" => "לא ניתן להסיר משתמש מהקבוצה %s",
 "Disable" => "בטל",
-"Enable" => "הפעל",
+"Enable" => "הפעלה",
 "Error" => "שגיאה",
-"Saving..." => "שומר..",
+"Saving..." => "שמירה…",
 "undo" => "ביטול",
 "Groups" => "קבוצות",
 "Group Admin" => "מנהל הקבוצה",
@@ -24,6 +24,7 @@
 "__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 כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט.",
+"Log" => "יומן",
 "More" => "יותר",
 "Less" => "פחות",
 "Version" => "גרסא",
@@ -41,13 +42,13 @@
 "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" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
-"Password" => "ססמה",
+"Password" => "סיסמא",
 "Your password was changed" => "הססמה שלך הוחלפה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
 "Current password" => "ססמה נוכחית",
 "New password" => "ססמה חדשה",
 "Change password" => "שינוי ססמה",
-"Email" => "דוא״ל",
+"Email" => "דואר אלקטרוני",
 "Your email address" => "כתובת הדוא״ל שלך",
 "Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
 "Language" => "פה",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 013cce38908e79292be08ac1ba58e39748bcd1d6..87ebf13f798db10f4ca6b008c73b6deca195facf 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -15,6 +15,9 @@
 "Group Admin" => "Grupa Admin",
 "Delete" => "Obriši",
 "__language_name__" => "__ime_jezika__",
+"Cron" => "Cron",
+"Log" => "dnevnik",
+"More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
 "See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index a91e8ff49121988dd4d5f5e6650bcf3b4aac495d..70cbf3d13652e8a571ef657f2c8d03aaf3011afc 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Authentication error" => "Azonosítási hiba",
+"Your display name has been changed." => "Az Ön megjelenítési neve megváltozott.",
 "Unable to change display name" => "Nem sikerült megváltoztatni a megjelenítési nevet",
 "Group already exists" => "A csoport már létezik",
 "Unable to add group" => "A csoport nem hozható létre",
@@ -17,7 +18,7 @@
 "Couldn't update app." => "A program frissítése nem sikerült.",
 "Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
 "Disable" => "Letiltás",
-"Enable" => "Engedélyezés",
+"Enable" => "engedélyezve",
 "Please wait...." => "Kérem várjon...",
 "Error" => "Hiba",
 "Updating...." => "Frissítés folyamatban...",
@@ -91,9 +92,6 @@
 "New password" => "Az új jelszó",
 "Change password" => "A jelszó megváltoztatása",
 "Display Name" => "A megjelenített név",
-"Your display name was changed" => "Az Ön megjelenítési neve megváltozott",
-"Unable to change your display name" => "Nem sikerült megváltoztatni az Ön megjelenítési nevét",
-"Change display name" => "A megjelenítési név módosítása",
 "Email" => "Email",
 "Your email address" => "Az Ön email címe",
 "Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "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.",
 "Login Name" => "Bejelentkezési név",
 "Create" => "Létrehozás",
+"Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
 "Default Storage" => "Alapértelmezett tárhely",
 "Unlimited" => "Korlátlan",
 "Other" => "Más",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 88cb8dbf9aaa93ce0163a89b73d63a88a9d55f12..8d67b45347a72e1b0b6b78d867f00fe8c09a02bf 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,9 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Language changed" => "Linguage cambiate",
 "Invalid request" => "Requesta invalide",
+"Error" => "Error",
 "Groups" => "Gruppos",
 "Delete" => "Deler",
 "__language_name__" => "Interlingua",
+"Log" => "Registro",
+"More" => "Plus",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
 "Update" => "Actualisar",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 2943e78a97291f94653b6609362684a95cb6de9b..fb5ee229f155a49edbdaba65cfdaecf7b29190a6 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
-"Authentication error" => "Galat autentikasi",
+"Authentication error" => "Galat saat autentikasi",
 "Unable to change display name" => "Tidak dapat mengubah nama tampilan",
 "Group already exists" => "Grup sudah ada",
 "Unable to add group" => "Tidak dapat menambah grup",
@@ -17,7 +17,7 @@
 "Couldn't update app." => "Tidak dapat memperbarui aplikasi.",
 "Update to {appversion}" => "Perbarui ke {appversion}",
 "Disable" => "Nonaktifkan",
-"Enable" => "Aktifkan",
+"Enable" => "aktifkan",
 "Please wait...." => "Mohon tunggu....",
 "Error" => "Galat",
 "Updating...." => "Memperbarui....",
@@ -38,7 +38,7 @@
 "Security Warning" => "Peringatan Keamanan",
 "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." => "Mungkin direktori data dan berkas Anda dapat diakses dari internet. Berkas .htaccess yang disediakan oleh ownCloud tidak berfungsi. Kami sangat menyarankan Anda untuk mengonfigurasi webserver Anda agar direktori data tidak lagi dapat diakses atau pindahkan direktori data ke luar akar dokumen webserver.",
 "Setup Warning" => "Peringatan Persiapan",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasi untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
 "Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' tidak ada",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
@@ -91,9 +91,6 @@
 "New password" => "Sandi baru",
 "Change password" => "Ubah sandi",
 "Display Name" => "Nama Tampilan",
-"Your display name was changed" => "Nama tampilan Anda telah diubah",
-"Unable to change your display name" => "Tidak dapat mengubah nama tampilan Anda",
-"Change display name" => "Ubah nama tampilan",
 "Email" => "Email",
 "Your email address" => "Alamat email Anda",
 "Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan sandi",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index c48db84b1e52aa5abd0b5685aa4219e1a3a9e6b4..38c22ea06dea33438664f80f75ae6f825f2eefef 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Authentication error" => "Errore di autenticazione",
+"Your display name has been changed." => "Il tuo nome visualizzato è stato cambiato.",
 "Unable to change display name" => "Impossibile cambiare il nome visualizzato",
 "Group already exists" => "Il gruppo esiste già",
 "Unable to add group" => "Impossibile aggiungere il gruppo",
@@ -65,7 +66,7 @@
 "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Connettiti a questa istanza di ownCloud tramite HTTPS per abilitare o disabilitare la protezione SSL.",
 "Log" => "Log",
 "Log level" => "Livello di log",
-"More" => "Più",
+"More" => "Altro",
 "Less" => "Meno",
 "Version" => "Versione",
 "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>." => "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>.",
@@ -91,10 +92,7 @@
 "New password" => "Nuova password",
 "Change password" => "Modifica password",
 "Display Name" => "Nome visualizzato",
-"Your display name was changed" => "Il tuo nome visualizzato è stato cambiato",
-"Unable to change your display name" => "Impossibile cambiare il tuo nome visualizzato",
-"Change display name" => "Cambia il nome visualizzato",
-"Email" => "Email",
+"Email" => "Posta elettronica",
 "Your email address" => "Il tuo indirizzo email",
 "Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
 "Language" => "Lingua",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
 "Login Name" => "Nome utente",
 "Create" => "Crea",
+"Admin Recovery Password" => "Password di ripristino amministrativa",
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index af3cdc9aeb0eb24bb3ba36692581ee745643ca38..ad42d3f085b90cdeffc0fdc275c7520aafdd8185 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Authentication error" => "認証エラー",
+"Your display name has been changed." => "表示名を変更しました。",
 "Unable to change display name" => "表示名を変更できません",
 "Group already exists" => "グループは既に存在しています",
 "Unable to add group" => "グループを追加できません",
@@ -10,14 +11,14 @@
 "Unable to delete group" => "グループを削除できません",
 "Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
-"Invalid request" => "無効なリクエストです",
+"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 から削除できません",
 "Couldn't update app." => "アプリを更新出来ませんでした。",
 "Update to {appversion}" => "{appversion} に更新",
 "Disable" => "無効",
-"Enable" => "有効",
+"Enable" => "有効化",
 "Please wait...." => "しばらくお待ちください。",
 "Error" => "エラー",
 "Updating...." => "更新中....",
@@ -65,10 +66,10 @@
 "Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "常にSSL接続を有効／無効にするために、HTTPS経由でこの ownCloud に接続して下さい。",
 "Log" => "ログ",
 "Log level" => "ログレベル",
-"More" => "詳細",
+"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 community</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> ライセンスにより提供されています。",
+"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" => "アプリを追加",
 "More Apps" => "さらにアプリを表示",
 "Select an App" => "アプリを選択してください",
@@ -82,19 +83,16 @@
 "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" => "初回実行ウィザードを再度表示する",
+"Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
+"Show First Run Wizard again" => "初回ウィザードを再表示する",
 "Password" => "パスワード",
 "Your password was changed" => "パスワードを変更しました",
 "Unable to change your password" => "パスワードを変更することができません",
-"Current password" => "現在のパスワード",
-"New password" => "新しいパスワード",
+"Current password" => "Current password",
+"New password" => "新しいパスワードを入力",
 "Change password" => "パスワードを変更",
 "Display Name" => "表示名",
-"Your display name was changed" => "あなたの表示名を変更しました",
-"Unable to change your display name" => "あなたの表示名を変更できません",
-"Change display name" => "表示名を変更",
-"Email" => "Email",
+"Email" => "メール",
 "Your email address" => "あなたのメールアドレス",
 "Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です",
 "Language" => "言語",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
 "Login Name" => "ログイン名",
 "Create" => "作成",
+"Admin Recovery Password" => "管理者復旧パスワード",
 "Default Storage" => "デフォルトストレージ",
 "Unlimited" => "無制限",
 "Other" => "その他",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 09de18ae1c2441aabc69351e4af1215775de786c..f6f4249e68fcff8ef6d3c489fbe3890238780c52 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.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" => "ჯგუფის დამატება ვერ მოხერხდა",
@@ -27,7 +28,7 @@
 "deleted" => "წაშლილი",
 "undo" => "დაბრუნება",
 "Unable to remove user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
-"Groups" => "ჯგუფი",
+"Groups" => "ჯგუფები",
 "Group Admin" => "ჯგუფის ადმინისტრატორი",
 "Delete" => "წაშლა",
 "add group" => "ჯგუფის დამატება",
@@ -66,7 +67,7 @@
 "Log" => "ლოგი",
 "Log level" => "ლოგირების დონე",
 "More" => "უფრო მეტი",
-"Less" => "naklebi",
+"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 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> ლიცენზიის ფარგლებში.",
 "Add your App" => "დაამატე შენი აპლიკაცია",
@@ -91,9 +92,6 @@
 "New password" => "ახალი პაროლი",
 "Change password" => "პაროლის შეცვლა",
 "Display Name" => "დისპლეის სახელი",
-"Your display name was changed" => "დისფლეის სახელი შეიცვალა",
-"Unable to change your display name" => "თქვენი დისფლეის სახელის შეცვლა ვერ მოხერხდა",
-"Change display name" => "დისფლეის სახელის შეცვლა",
 "Email" => "იმეილი",
 "Your email address" => "თქვენი იმეილ მისამართი",
 "Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index b5dbffad0852619a39ed652e40cec961222ab044..2a139a025627527c7c5039fbdaef5a4caf3d17cd 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -14,7 +14,7 @@
 "Unable to add user to group %s" => "그룹 %s에 사용자를 추가할 수 없습니다.",
 "Unable to remove user from group %s" => "그룹 %s에서 사용자를 삭제할 수 없습니다.",
 "Disable" => "비활성화",
-"Enable" => "활성화",
+"Enable" => "사용함",
 "Error" => "오류",
 "Saving..." => "저장 중...",
 "deleted" => "삭제",
@@ -26,6 +26,9 @@
 "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" => "설정 경고",
+"Cron" => "크론",
+"Log" => "로그",
+"Log level" => "로그 단계",
 "More" => "더 중요함",
 "Less" => "덜 중요함",
 "Version" => "버전",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 793ae3d4dcd58fb6f4bb994e9078ca0f338fb64f..427e6568a403a43a531df9b03fdf981b247e712e 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -16,6 +16,15 @@
 "Delete" => "Läschen",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sécherheets Warnung",
+"Cron" => "Cron",
+"Enable Share API" => "Share API aschalten",
+"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
+"Allow links" => "Links erlaben",
+"Allow resharing" => "Resharing erlaben",
+"Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
+"Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
+"Log" => "Log",
+"More" => "Méi",
 "Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
 "See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 91782289e2e560d13facacc7e5ed84e6f54d2ca6..dba1f92017eef18786d64ad69587e2779b8cc81f 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -9,13 +9,17 @@
 "Disable" => "IÅ¡jungti",
 "Enable" => "Įjungti",
 "Error" => "Klaida",
-"Saving..." => "Saugoma..",
+"Saving..." => "Saugoma...",
 "undo" => "anuliuoti",
 "Groups" => "GrupÄ—s",
 "Delete" => "IÅ¡trinti",
 "__language_name__" => "Kalba",
 "Security Warning" => "Saugumo pranešimas",
 "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." => "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur.",
+"Cron" => "Cron",
+"Sharing" => "Dalijimasis",
+"Log" => "Žurnalas",
+"Log level" => "Žurnalo išsamumas",
 "More" => "Daugiau",
 "Less" => "Mažiau",
 "Add your App" => "PridÄ—ti programÄ—lÄ™",
@@ -29,7 +33,7 @@
 "Current password" => "Dabartinis slaptažodis",
 "New password" => "Naujas slaptažodis",
 "Change password" => "Pakeisti slaptažodį",
-"Email" => "El. paštas",
+"Email" => "El. Paštas",
 "Your email address" => "Jūsų el. pašto adresas",
 "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Language" => "Kalba",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index f5fd8b76bc928b8bbbd679e1470d1d0a55b195b6..5864a392ace60adb09e93159e41c31f4d583f894 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -10,7 +10,7 @@
 "Unable to delete group" => "Nevar izdzēst grupu",
 "Unable to delete user" => "Nevar izdzēst lietotāju",
 "Language changed" => "Valoda tika nomainīta",
-"Invalid request" => "Nederīgs pieprasījums",
+"Invalid request" => "Nederīgs vaicājums",
 "Admins can't remove themself from the admin group" => "Administratori nevar izņemt paši sevi no administratoru grupas",
 "Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
 "Unable to remove user from group %s" => "Nevar izņemt lietotāju no grupas %s",
@@ -91,9 +91,6 @@
 "New password" => "Jauna parole",
 "Change password" => "Mainīt paroli",
 "Display Name" => "Redzamais vārds",
-"Your display name was changed" => "Jūsu redzamais vārds tika mainīts",
-"Unable to change your display name" => "Nevarēja mainīt jūsu redzamo vārdu",
-"Change display name" => "Mainīt redzamo vārdu",
 "Email" => "E-pasts",
 "Your email address" => "JÅ«su e-pasta adrese",
 "Fill in an email address to enable password recovery" => "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 760b8912c25448e8130f931451d53e956e4cb91c..902a8d2d6a798a2d25496e2629ecb8b7380842f5 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -9,7 +9,7 @@
 "Unable to delete group" => "Неможе да избришам група",
 "Unable to delete user" => "Неможам да избришам корисник",
 "Language changed" => "Јазикот е сменет",
-"Invalid request" => "неправилно барање",
+"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",
@@ -24,6 +24,8 @@
 "__language_name__" => "__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 не фунционира. Силно препорачуваме да го исконфигурирате вашиот сервер за вашата папка со податоци не е достапна преку интернетт или преместете ја надвор од коренот на веб серверот.",
+"Log" => "Записник",
+"Log level" => "Ниво на логирање",
 "More" => "Повеќе",
 "Less" => "Помалку",
 "Version" => "Верзија",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index a0022d5ba3124716fd47834bb8952a7d6128da92..a0b94f1a1bd1f94c0a4049bf9a9b80497f072682 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -13,16 +13,19 @@
 "Delete" => "Padam",
 "__language_name__" => "_nama_bahasa_",
 "Security Warning" => "Amaran keselamatan",
+"Log" => "Log",
+"Log level" => "Tahap Log",
+"More" => "Lanjutan",
 "Add your App" => "Tambah apps anda",
 "Select an App" => "Pilih aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
 "Update" => "Kemaskini",
-"Password" => "Kata laluan ",
+"Password" => "Kata laluan",
 "Unable to change your password" => "Gagal mengubah kata laluan anda ",
 "Current password" => "Kata laluan semasa",
 "New password" => "Kata laluan baru",
 "Change password" => "Ubah kata laluan",
-"Email" => "Emel",
+"Email" => "Email",
 "Your email address" => "Alamat emel anda",
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Language" => "Bahasa",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 25b67d6c01fbe30e19c9ae4570ca26ce2d345d40..9f18bf472acddcd98607e77e7ca70bfcb31ee9e7 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
-"Authentication error" => "Autentikasjonsfeil",
+"Authentication error" => "Autentiseringsfeil",
+"Your display name has been changed." => "Ditt visningsnavn er blitt endret.",
+"Unable to change display name" => "Kunne ikke endre visningsnavn",
 "Group already exists" => "Gruppen finnes allerede",
 "Unable to add group" => "Kan ikke legge til gruppe",
 "Could not enable app. " => "Kan ikke aktivere app.",
@@ -10,44 +12,100 @@
 "Unable to delete user" => "Kan ikke slette bruker",
 "Language changed" => "Språk endret",
 "Invalid request" => "Ugyldig forespørsel",
+"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
 "Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
 "Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
+"Couldn't update app." => "Kunne ikke oppdatere app.",
+"Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå avBehandle ",
-"Enable" => "Slå på",
+"Enable" => "Aktiver",
+"Please wait...." => "Vennligst vent...",
 "Error" => "Feil",
+"Updating...." => "Oppdaterer...",
+"Error while updating app" => "Feil ved oppdatering av app",
+"Updated" => "Oppdatert",
 "Saving..." => "Lagrer...",
 "deleted" => "slettet",
 "undo" => "angre",
+"Unable to remove user" => "Kunne ikke slette bruker",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppeadministrator",
 "Delete" => "Slett",
+"add group" => "legg til gruppe",
+"A valid username must be provided" => "Oppgi et gyldig brukernavn",
+"Error creating user" => "Feil ved oppretting av bruker",
+"A valid password must be provided" => "Oppgi et gyldig passord",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sikkerhetsadvarsel",
+"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." => "Ditt data mappe og dine filer er sannsynligvis tilgjengelig fra internet. .htaccess filene som ownCloud bruker virker ikke. Du bør konfigurere din nettserver slik at data mappa ikke lenger er tilgjengelig eller flytt data mappe ut av nettserverens dokumentområde.",
+"Setup Warning" => "Installasjonsadvarsel",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+"Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+"Locale not working" => "Språk virker ikke",
+"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." => "Denne ownCloud serveren kan ikke sette systemspråk til %s. Det kan være problemer med visse tegn i filnavn. Vi foreslår at du installerer de nødvendige pakkene på ditt system for å støtte %s.",
+"Internet connection not working" => "Ingen internettilkopling",
+"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." => "Denne ownCloud serveren har ikke tilkopling til internett. Noen funksjoner som f.eks. tilkopling til ekstern lager, melgin om oppdatering og installasjon av tredjeparts apps vil ikke virke. Vi foreslår at du aktivere en internettilkopling til denne serveren hvis du vil bruke alle funksjonene i ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert som webcron-tjeneste. Kjør cron.php siden  i ownCloud rot hvert minutt vha http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk systemets crontjeneste. Kjør cron.php filen i owncloud mappa vha systemets crontjeneste hver minutt.",
+"Sharing" => "Deling",
+"Enable Share API" => "Aktiver API for Deling",
+"Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
+"Allow links" => "Tillat lenker",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
+"Allow resharing" => "TIllat videredeling",
+"Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
+"Allow users to share with anyone" => "Tillat brukere å dele med alle",
+"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
+"Security" => "Sikkerhet",
+"Enforce HTTPS" => "Tving HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvinger klienter til å bruke ownCloud via kryptert tilkopling.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vær vennlig, bruk denne ownCloud instansen via HTTPS for å aktivere eller deaktivere tvungen bruk av SSL.",
+"Log" => "Logg",
+"Log level" => "Loggnivå",
 "More" => "Mer",
 "Less" => "Mindre",
 "Version" => "Versjon",
+"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>." => "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>.",
 "Add your App" => "Legg til din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Velg en app",
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
 "Update" => "Oppdater",
 "User Documentation" => "Brukerdokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
+"Online Documentation" => "Online dokumentasjon",
+"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",
 "Password" => "Passord",
 "Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
 "Current password" => "Nåværende passord",
 "New password" => "Nytt passord",
 "Change password" => "Endre passord",
-"Email" => "E-post",
+"Display Name" => "Visningsnavn",
+"Email" => "Epost",
 "Your email address" => "Din e-postadresse",
 "Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressen for å kople til ownCloud i din filbehandler",
+"Login Name" => "Logginn navn",
 "Create" => "Opprett",
-"Other" => "Annet"
+"Default Storage" => "Standard lager",
+"Unlimited" => "Ubegrenset",
+"Other" => "Annet",
+"Storage" => "Lager",
+"change display name" => "endre visningsnavn",
+"set new password" => "sett nytt passord",
+"Default" => "Standard"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 26a0773e7ba16d8cdac8559aa8f225e0e3db3252..00de9e8b49ac6bda9dd5c27054bb41f5755adf02 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Authentication error" => "Authenticatie fout",
+"Your display name has been changed." => "Uw weergavenaam is gewijzigd.",
 "Unable to change display name" => "Kon de weergavenaam niet wijzigen",
 "Group already exists" => "Groep bestaat al",
 "Unable to add group" => "Niet in staat om groep toe te voegen",
@@ -10,26 +11,26 @@
 "Unable to delete group" => "Niet in staat om groep te verwijderen",
 "Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
 "Language changed" => "Taal aangepast",
-"Invalid request" => "Ongeldig verzoek",
+"Invalid request" => "Ongeldige aanvraag",
 "Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
 "Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
 "Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
 "Couldn't update app." => "Kon de app niet bijwerken.",
 "Update to {appversion}" => "Bijwerken naar {appversion}",
 "Disable" => "Uitschakelen",
-"Enable" => "Inschakelen",
+"Enable" => "Activeer",
 "Please wait...." => "Even geduld aub....",
 "Error" => "Fout",
 "Updating...." => "Bijwerken....",
 "Error while updating app" => "Fout bij bijwerken app",
 "Updated" => "Bijgewerkt",
-"Saving..." => "Aan het bewaren.....",
+"Saving..." => "Opslaan",
 "deleted" => "verwijderd",
 "undo" => "ongedaan maken",
 "Unable to remove user" => "Kon gebruiker niet verwijderen",
 "Groups" => "Groepen",
 "Group Admin" => "Groep beheerder",
-"Delete" => "verwijderen",
+"Delete" => "Verwijder",
 "add group" => "toevoegen groep",
 "A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
 "Error creating user" => "Fout bij aanmaken gebruiker",
@@ -39,7 +40,7 @@
 "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." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.",
 "Setup Warning" => "Instellingswaarschuwing",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
-"Please double check the <a href='%s'>installation guides</a>." => "Conntroleer de <a href='%s'>installatie handleiding</a> goed.",
+"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
 "Locale not working" => "Taalbestand werkt niet",
@@ -88,12 +89,9 @@
 "Your password was changed" => "Je wachtwoord is veranderd",
 "Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
 "Current password" => "Huidig wachtwoord",
-"New password" => "Nieuw wachtwoord",
+"New password" => "Nieuw",
 "Change password" => "Wijzig wachtwoord",
 "Display Name" => "Weergavenaam",
-"Your display name was changed" => "Uw weergavenaam is gewijzigd",
-"Unable to change your display name" => "Kon de weergavenaam niet wijzigen",
-"Change display name" => "Wijzig 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",
@@ -103,9 +101,10 @@
 "Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
+"Admin Recovery Password" => "Beheer herstel wachtwoord",
 "Default Storage" => "Default opslag",
 "Unlimited" => "Ongelimiteerd",
-"Other" => "Andere",
+"Other" => "Anders",
 "Storage" => "Opslag",
 "change display name" => "wijzig weergavenaam",
 "set new password" => "Instellen nieuw wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index cee3ecaeac485281ff4f59e854489f9bbea7ea64..3008873c861c750ed7db5a7bccf76fb2de2d143c 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,28 +1,111 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
-"Authentication error" => "Feil i autentisering",
+"Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
+"Authentication error" => "Autentiseringsfeil",
+"Your display name has been changed." => "Visingsnamnet ditt er endra.",
+"Unable to change display name" => "Klarte ikkje endra visingsnamnet",
+"Group already exists" => "Gruppa finst allereie",
+"Unable to add group" => "Klarte ikkje leggja til gruppa",
+"Could not enable app. " => "Klarte ikkje slå på programmet.",
 "Email saved" => "E-postadresse lagra",
 "Invalid email" => "Ugyldig e-postadresse",
+"Unable to delete group" => "Klarte ikkje å sletta gruppa",
+"Unable to delete user" => "Klarte ikkje sletta brukaren",
 "Language changed" => "Språk endra",
 "Invalid request" => "Ugyldig førespurnad",
+"Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
+"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
+"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
+"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
+"Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå av",
 "Enable" => "Slå på",
+"Please wait...." => "Ver venleg og vent …",
 "Error" => "Feil",
+"Updating...." => "Oppdaterer …",
+"Error while updating app" => "Feil ved oppdatering av app",
+"Updated" => "Oppdatert",
+"Saving..." => "Lagrar …",
+"deleted" => "sletta",
+"undo" => "angra",
+"Unable to remove user" => "Klarte ikkje fjerna brukaren",
 "Groups" => "Grupper",
+"Group Admin" => "Gruppestyrar",
 "Delete" => "Slett",
+"add group" => "legg til gruppe",
+"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
+"Error creating user" => "Feil ved oppretting av brukar",
+"A valid password must be provided" => "Du må oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
-"Select an App" => "Vel ein applikasjon",
+"Security Warning" => "Tryggleiksåtvaring",
+"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." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett. Fila .htaccess som ownCloud tilbyr fungerer ikkje. Me rår sterkt til at du set opp tenaren din slik at datamappa ikkje lenger er tilgjengeleg, eller at du flyttar datamappa vekk frå dokumentrota til tenaren.",
+"Setup Warning" => "Oppsettsåtvaring",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
+"Locale not working" => "Regionaldata fungerer ikkje",
+"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." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s.",
+"Internet connection not working" => "Nettilkoplinga fungerer ikkje",
+"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." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet.",
+"Sharing" => "Deling",
+"Enable Share API" => "Slå på API-et for deling",
+"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
+"Allow links" => "Tillat lenkjer",
+"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
+"Allow resharing" => "Tillat vidaredeling",
+"Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
+"Allow users to share with anyone" => "La brukarar dela med kven som helst",
+"Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
+"Security" => "Tryggleik",
+"Enforce HTTPS" => "Krev HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Krev at klientar koplar til ownCloud med ei kryptert tilkopling.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga.",
+"Log" => "Logg",
+"Log level" => "Log nivå",
+"More" => "Meir",
+"Less" => "Mindre",
+"Version" => "Utgåve",
+"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=\"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>.",
+"Add your App" => "Legg til din app",
+"More Apps" => "Fleire app-ar",
+"Select an App" => "Vel eit program",
+"See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
 "Update" => "Oppdater",
+"User Documentation" => "Brukardokumentasjon",
+"Administrator Documentation" => "Administratordokumentasjon",
+"Online Documentation" => "Dokumentasjon på nett",
+"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",
 "Password" => "Passord",
-"Unable to change your password" => "Klarte ikkje å endra passordet",
+"Your password was changed" => "Passordet ditt er endra",
+"Unable to change your password" => "Klarte ikkje endra passordet",
 "Current password" => "Passord",
 "New password" => "Nytt passord",
 "Change password" => "Endra passord",
-"Email" => "Epost",
-"Your email address" => "Din epost addresse",
-"Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
+"Display Name" => "Visingsnamn",
+"Email" => "E-post",
+"Your email address" => "Di epost-adresse",
+"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
 "Language" => "Språk",
-"Help translate" => "Hjelp oss å oversett",
+"Help translate" => "Hjelp oss å omsetja",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din",
+"Login Name" => "Innloggingsnamn",
 "Create" => "Lag",
-"Other" => "Anna"
+"Default Storage" => "Standardlagring",
+"Unlimited" => "Ubegrensa",
+"Other" => "Anna",
+"Storage" => "Lagring",
+"change display name" => "endra visingsnamn",
+"set new password" => "lag nytt passord",
+"Default" => "Standard"
 );
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 589ccb09bd4641348de75fafaf19d8921a6963fc..052974591a2a06b9b85302e60950715749646567 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -23,6 +23,13 @@
 "Delete" => "Escafa",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Avertiment de securitat",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Utiliza lo servici cron de ton sistèm operatiu. Executa lo fichièr cron.php dins lo dorsier owncloud tras cronjob del sistèm cada minuta.",
+"Sharing" => "Al partejar",
+"Enable Share API" => "Activa API partejada",
+"Log" => "Jornal",
+"More" => "Mai d'aquò",
 "Add your App" => "Ajusta ton App",
 "Select an App" => "Selecciona una applicacion",
 "See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 664d46ea3ab6c07fdc49e6cb8a3c2af2a8826deb..908a930339d928cafb8fe38953efe715ae9f8b9e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "BÅ‚Ä…d uwierzytelniania",
+"Your display name has been changed." => "Twoje wyświetlana nazwa została zmieniona.",
 "Unable to change display name" => "Nie można zmienić wyświetlanej nazwy",
 "Group already exists" => "Grupa już istnieje",
 "Unable to add group" => "Nie można dodać grupy",
@@ -74,7 +75,7 @@
 "Select an App" => "Zaznacz aplikacjÄ™",
 "See application page at apps.owncloud.com" => "Zobacz stronÄ™ aplikacji na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
-"Update" => "Zaktualizuj",
+"Update" => "Aktualizuj",
 "User Documentation" => "Dokumentacja użytkownika",
 "Administrator Documentation" => "Dokumentacja administratora",
 "Online Documentation" => "Dokumentacja online",
@@ -91,10 +92,7 @@
 "New password" => "Nowe hasło",
 "Change password" => "Zmień hasło",
 "Display Name" => "Wyświetlana nazwa",
-"Your display name was changed" => "Twoja nazwa wyświetlana została zmieniona",
-"Unable to change your display name" => "Nie można zmienić twojej wyświetlanej nazwy",
-"Change display name" => "Zmień wyświetlaną nazwę",
-"Email" => "E-mail",
+"Email" => "Email",
 "Your email address" => "Twój adres e-mail",
 "Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła",
 "Language" => "Język",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
 "Login Name" => "Login",
 "Create" => "Utwórz",
+"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
 "Default Storage" => "Magazyn domyślny",
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 040afa84de2948439ab29c5ad3ba05371f4acb65..824940da583d89e75504ad98237ccc9275fcd618 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,20 +1,21 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
 "Authentication error" => "Erro de autenticação",
+"Your display name has been changed." => "A exibição de seu nome foi alterada.",
 "Unable to change display name" => "Impossível alterar nome de exibição",
 "Group already exists" => "Grupo já existe",
 "Unable to add group" => "Não foi possível adicionar grupo",
 "Could not enable app. " => "Não foi possível habilitar aplicativo.",
-"Email saved" => "E-mail guardado",
+"Email saved" => "E-mail salvo",
 "Invalid email" => "E-mail inválido",
 "Unable to delete group" => "Não foi possível remover grupo",
 "Unable to delete user" => "Não foi possível remover usuário",
 "Language changed" => "Idioma alterado",
 "Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Admins não podem se remover do grupo admin",
+"Admins can't remove themself from the admin group" => "Admins não podem ser removidos do grupo admin",
 "Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s",
 "Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s",
-"Couldn't update app." => "Não foi possível atualizar o app.",
+"Couldn't update app." => "Não foi possível atualizar a app.",
 "Update to {appversion}" => "Atualizar para {appversion}",
 "Disable" => "Desabilitar",
 "Enable" => "Habilitar",
@@ -23,7 +24,7 @@
 "Updating...." => "Atualizando...",
 "Error while updating app" => "Erro ao atualizar aplicativo",
 "Updated" => "Atualizado",
-"Saving..." => "Guardando...",
+"Saving..." => "Salvando...",
 "deleted" => "excluído",
 "undo" => "desfazer",
 "Unable to remove user" => "Impossível remover usuário",
@@ -38,8 +39,8 @@
 "Security Warning" => "Aviso de Segurança",
 "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." => "Seu diretório de dados e seus arquivos estão, provavelmente, acessíveis a partir da internet. O .htaccess que o ownCloud fornece não está funcionando. Nós sugerimos que você configure o seu servidor web de uma forma que o diretório de dados esteja mais acessível ou que você mova o diretório de dados para fora da raiz do servidor web.",
 "Setup Warning" => "Aviso de Configuração",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
+"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira o <a href='%s'>guia de instalação</a>.",
 "Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
 "Locale not working" => "Localização não funcionando",
@@ -91,9 +92,6 @@
 "New password" => "Nova senha",
 "Change password" => "Alterar senha",
 "Display Name" => "Nome de Exibição",
-"Your display name was changed" => "Seu nome de exibição foi alterado",
-"Unable to change your display name" => "Impossível alterar seu nome de exibição",
-"Change display name" => "Alterar nome de exibição",
 "Email" => "E-mail",
 "Your email address" => "Seu endereço de e-mail",
 "Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos",
 "Login Name" => "Nome de Login",
 "Create" => "Criar",
+"Admin Recovery Password" => "Recuperação da Senha do Administrador",
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index b6538fbdd134659a59ebcc40ca355359f9854fe5..c5fc1a009267ef74ac74893148f7d3ac3c9c7a6e 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
-"Authentication error" => "Erro de autenticação",
+"Authentication error" => "Erro na autenticação",
+"Your display name has been changed." => "O seu nome foi alterado",
 "Unable to change display name" => "Não foi possível alterar o nome",
 "Group already exists" => "O grupo já existe",
 "Unable to add group" => "Impossível acrescentar o grupo",
@@ -10,7 +11,7 @@
 "Unable to delete group" => "Impossível apagar grupo",
 "Unable to delete user" => "Impossível apagar utilizador",
 "Language changed" => "Idioma alterado",
-"Invalid request" => "Pedido inválido",
+"Invalid request" => "Pedido Inválido",
 "Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
 "Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
 "Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
@@ -29,7 +30,7 @@
 "Unable to remove user" => "Não foi possível remover o utilizador",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo Administrador",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
 "add group" => "Adicionar grupo",
 "A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
 "Error creating user" => "Erro a criar utilizador",
@@ -84,17 +85,14 @@
 "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",
-"Password" => "Palavra-chave",
+"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",
 "Current password" => "Palavra-chave actual",
 "New password" => "Nova palavra-chave",
 "Change password" => "Alterar palavra-chave",
 "Display Name" => "Nome público",
-"Your display name was changed" => "O seu nome foi alterado",
-"Unable to change your display name" => "Não foi possível alterar o seu nome",
-"Change display name" => "Alterar nome",
-"Email" => "endereço de email",
+"Email" => "Email",
 "Your email address" => "O seu endereço de email",
 "Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
 "Language" => "Idioma",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
+"Admin Recovery Password" => "Recuperar password de administrador",
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index e0729fcb71dbe02a6065a14fd35becd232c7b747..f48e0bae0ad65af3548015943549a5dc554017fe 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
-"Authentication error" => "Eroare de autentificare",
+"Authentication error" => "Eroare la autentificare",
 "Group already exists" => "Grupul există deja",
 "Unable to add group" => "Nu s-a putut adăuga grupul",
 "Could not enable app. " => "Nu s-a putut activa aplicația.",
@@ -14,9 +14,9 @@
 "Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
 "Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
 "Disable" => "Dezactivați",
-"Enable" => "Activați",
+"Enable" => "Activare",
 "Error" => "Eroare",
-"Saving..." => "Salvez...",
+"Saving..." => "Se salvează...",
 "deleted" => "șters",
 "undo" => "Anulează ultima acțiune",
 "Groups" => "Grupuri",
@@ -25,6 +25,21 @@
 "__language_name__" => "_language_name_",
 "Security Warning" => "Avertisment de securitate",
 "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." => "Directorul tău de date și fișierele tale probabil sunt accesibile prin internet. Fișierul .htaccess oferit de ownCloud nu funcționează. Îți recomandăm să configurezi server-ul tău web într-un mod în care directorul de date să nu mai fie accesibil sau mută directorul de date în afara directorului root al server-ului web.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php este înregistrat în serviciul webcron. Accesează pagina cron.php din root-ul owncloud odată pe minut prin http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Folosește serviciul cron al sistemului. Accesează fișierul cron.php din directorul owncloud printr-un cronjob de sistem odată la fiecare minut.",
+"Sharing" => "Partajare",
+"Enable Share API" => "Activare API partajare",
+"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
+"Allow links" => "Pemite legături",
+"Allow users to share items to the public with links" => "Permite utilizatorilor să partajeze fișiere în mod public prin legături",
+"Allow resharing" => "Permite repartajarea",
+"Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
+"Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
+"Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
+"Log" => "Jurnal de activitate",
+"Log level" => "Nivel jurnal",
 "More" => "Mai mult",
 "Less" => "Mai puțin",
 "Version" => "Versiunea",
@@ -42,6 +57,7 @@
 "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 ",
 "Password" => "Parolă",
 "Your password was changed" => "Parola a fost modificată",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3a0be05ba1775cdfe3751970f0a958031eff02b9..e10e022e8e5108ef49eca172426249f4a219fa36 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Загрузка из App Store запрещена",
-"Authentication error" => "Ошибка авторизации",
+"Authentication error" => "Ошибка аутентификации",
+"Your display name has been changed." => "Ваше отображаемое имя было изменено.",
 "Unable to change display name" => "Невозможно изменить отображаемое имя",
 "Group already exists" => "Группа уже существует",
 "Unable to add group" => "Невозможно добавить группу",
@@ -10,7 +11,7 @@
 "Unable to delete group" => "Невозможно удалить группу",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
-"Invalid request" => "Неверный запрос",
+"Invalid request" => "Неправильный запрос",
 "Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
 "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
@@ -91,12 +92,9 @@
 "New password" => "Новый пароль",
 "Change password" => "Сменить пароль",
 "Display Name" => "Отображаемое имя",
-"Your display name was changed" => "Ваше отображаемое имя было изменено",
-"Unable to change your display name" => "Невозможно изменить Ваше отображаемое имя",
-"Change display name" => "Изменить отображаемое имя",
-"Email" => "e-mail",
+"Email" => "E-mail",
 "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",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 94cd0abfe69aa7b30426694f157f1759b33dc65a..d80f7b087347d87c7be7cb79c54d5ac8ed6525c6 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,68 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Невозможно загрузить список из App Store",
-"Authentication error" => "Ошибка авторизации",
-"Group already exists" => "Группа уже существует",
-"Unable to add group" => "Невозможно добавить группу",
-"Could not enable app. " => "Не удалось запустить приложение",
-"Email saved" => "Email сохранен",
-"Invalid email" => "Неверный email",
-"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",
-"Disable" => "Отключить",
-"Enable" => "Включить",
 "Error" => "Ошибка",
 "Saving..." => "Сохранение",
 "deleted" => "удалено",
-"undo" => "отменить действие",
 "Groups" => "Группы",
-"Group Admin" => "Группа Admin",
 "Delete" => "Удалить",
-"__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, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
-"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>.",
-"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 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>.",
-"Add your App" => "Добавить Ваше приложение",
-"More Apps" => "Больше приложений",
-"Select an App" => "Выбрать приложение",
-"See application page at apps.owncloud.com" => "Обратитесь к странице приложений на apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"Update" => "Обновить",
-"User Documentation" => "Документация пользователя",
-"Administrator Documentation" => "Документация администратора",
-"Online Documentation" => "Документация online",
-"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" => "Вновь показать помощника первоначальной настройки",
-"Password" => "Пароль",
-"Your password was changed" => "Ваш пароль был изменен",
-"Unable to change your password" => "Невозможно изменить Ваш пароль",
-"Current password" => "Текущий пароль",
-"New password" => "Новый пароль",
-"Change password" => "Изменить пароль",
-"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 в Вашем файловом менеджере",
-"Create" => "Создать",
-"Default Storage" => "Хранилище по умолчанию",
-"Unlimited" => "Неограниченный",
-"Other" => "Другой",
-"Storage" => "Хранилище",
-"set new password" => "назначить новый пароль",
-"Default" => "По умолчанию"
+"Email" => "Email",
+"Other" => "Другое"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index b40103ab9d7070a006f1eb4347171f1473e66954..4303b14c37ec2e6e3167821aa25b088f6ca25041 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -8,19 +8,26 @@
 "Unable to delete group" => "කණ්ඩායම මැකීමට නොහැක",
 "Unable to delete user" => "පරිශීලකයා මැකීමට නොහැක",
 "Language changed" => "භාෂාව ාවනස් කිරීම",
-"Invalid request" => "අවලංගු අයදුම",
+"Invalid request" => "අවලංගු අයැදුමක්",
 "Unable to add user to group %s" => "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
 "Unable to remove user from group %s" => "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
 "Disable" => "අක්‍රිය කරන්න",
-"Enable" => "ක්‍රියත්මක කරන්න",
+"Enable" => "සක්‍රිය කරන්න",
 "Error" => "දෝෂයක්",
 "Saving..." => "සුරැකෙමින් පවතී...",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
-"Groups" => "සමූහය",
+"Groups" => "කණ්ඩායම්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
-"Delete" => "මකා දමනවා",
+"Delete" => "මකා දමන්න",
 "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 ගොනුව ක්‍රියාකරන්නේ නැත. අපි තරයේ කියා සිටිනුයේ නම්, මෙම දත්ත හා ගොනු එසේ පිවිසීමට නොහැකි වන ලෙස ඔබේ වෙබ් සේවාදායකයා  වින්‍යාස කරන ලෙස හෝ එම ඩිරෙක්ටරිය වෙබ් මූලයෙන් පිටතට ගෙනයන ලෙසය.",
+"Sharing" => "හුවමාරු කිරීම",
+"Allow 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" => "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි",
+"Log" => "ලඝුව",
 "More" => "වැඩි",
 "Less" => "අඩු",
 "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>, 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> යටතේ.",
@@ -28,7 +35,7 @@
 "More Apps" => "තවත් යෙදුම්",
 "Select an App" => "යෙදුමක් තොරන්න",
 "Update" => "යාවත්කාල කිරීම",
-"Password" => "මුරපදය",
+"Password" => "මුර පදය",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
 "Current password" => "වත්මන් මුරපදය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 5b0b84f917fcc9cf1939a941e3950493da31890f..5d8445b4b3b85fc9462d26c6e40df25101c44926 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
-"Authentication error" => "Chyba pri autentifikácii",
+"Authentication error" => "Chyba autentifikácie",
+"Your display name has been changed." => "Vaše zobrazované meno bolo zmenené.",
 "Unable to change display name" => "Nemožno zmeniť zobrazované meno",
 "Group already exists" => "Skupina už existuje",
 "Unable to add group" => "Nie je možné pridať skupinu",
@@ -17,7 +18,7 @@
 "Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
 "Update to {appversion}" => "Aktualizovať na {appversion}",
 "Disable" => "Zakázať",
-"Enable" => "Povoliť",
+"Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
 "Error" => "Chyba",
 "Updating...." => "Aktualizujem...",
@@ -29,7 +30,7 @@
 "Unable to remove user" => "Nemožno odobrať používateľa",
 "Groups" => "Skupiny",
 "Group Admin" => "Správca skupiny",
-"Delete" => "Odstrániť",
+"Delete" => "Zmazať",
 "add group" => "pridať skupinu",
 "A valid username must be provided" => "Musíte zadať platné používateľské meno",
 "Error creating user" => "Chyba pri vytváraní používateľa",
@@ -91,9 +92,6 @@
 "New password" => "Nové heslo",
 "Change password" => "Zmeniť heslo",
 "Display Name" => "Zobrazované meno",
-"Your display name was changed" => "Vaše zobrazované meno bolo zmenené",
-"Unable to change your display name" => "Nemožno zmeniť Vaše zobrazované meno",
-"Change display name" => "Zmeniť zobrazované meno",
 "Email" => "Email",
 "Your email address" => "Vaša emailová adresa",
 "Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
@@ -103,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi",
 "Login Name" => "Prihlasovacie meno",
 "Create" => "Vytvoriť",
+"Admin Recovery Password" => "Obnovenie hesla administrátora",
 "Default Storage" => "Predvolené úložisko",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 3ba3799a5dd504f197a5b3889bb9baa71f208811..55d957cfa7d3e6e5f8cfc3b09e652078396c48ab 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz središča App Store",
-"Authentication error" => "Napaka overitve",
+"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz programskega središča",
+"Authentication error" => "Napaka med overjanjem",
+"Your display name has been changed." => "Prikazano ime je bilo spremenjeno.",
 "Unable to change display name" => "Prikazanega imena ni mogoče spremeniti.",
 "Group already exists" => "Skupina že obstaja",
 "Unable to add group" => "Skupine ni mogoče dodati",
@@ -91,10 +92,7 @@
 "New password" => "Novo geslo",
 "Change password" => "Spremeni geslo",
 "Display Name" => "Prikazano ime",
-"Your display name was changed" => "Prikazano ime je spremenjeno.",
-"Unable to change your display name" => "Prikazanega imena ni mogoče spremeniti.",
-"Change display name" => "Spremeni prikazano ime",
-"Email" => "Elektronska pošta",
+"Email" => "Elektronski naslov",
 "Your email address" => "Osebni elektronski naslov",
 "Fill in an email address to enable password recovery" => "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla",
 "Language" => "Jezik",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 36ae95c82528f9474ea5720b1936eea804edd098..03db0cd8fcd4fba4f2c2514082be3366cfe9be0f 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -9,5 +9,6 @@
 "Update" => "Azhurno",
 "Get the apps to sync your files" => "Merrni app-et për sinkronizimin e skedarëve tuaj",
 "Password" => "Kodi",
-"New password" => "Kodi i ri"
+"New password" => "Kodi i ri",
+"Email" => "Email-i"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 460fab121a03f177d851079410ef6fc3f9bce585..29e0661e44361d588a33d46a48605a3c7e000bff 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
-"Authentication error" => "Грешка при аутентификацији",
+"Authentication error" => "Грешка при провери идентитета",
+"Unable to change display name" => "Не могу да променим име за приказ",
 "Group already exists" => "Група већ постоји",
 "Unable to add group" => "Не могу да додам групу",
 "Could not enable app. " => "Не могу да укључим програм",
@@ -13,17 +14,54 @@
 "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" => "Укључи",
+"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__" => "__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“",
+"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" => "Локализација не ради",
+"Internet connection not working" => "Веза с интернетом не ради",
+"Execute one task with each page loaded" => "Изврши један задатак са сваком учитаном страницом",
+"Sharing" => "Дељење",
+"Enable Share API" => "Омогући API Share",
+"Allow apps to use the Share API" => "Дозвољава апликацијама да користе API Share",
+"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-ом путем шифроване везе.",
+"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)\">АГПЛ лиценцом</abbr></a>.",
 "Add your App" => "Додајте ваш програм",
 "More Apps" => "Више програма",
@@ -31,7 +69,14 @@
 "See application page at apps.owncloud.com" => "Погледајте страницу са програмима на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
 "Update" => "Ажурирај",
+"User Documentation" => "Корисничка документација",
+"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" => "Поново прикажи чаробњак за прво покретање",
 "Password" => "Лозинка",
 "Your password was changed" => "Лозинка је промењена",
@@ -39,11 +84,21 @@
 "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" => "Друго"
+"Default Storage" => "Подразумевано складиште",
+"Unlimited" => "Неограничено",
+"Other" => "Друго",
+"Storage" => "Складиште",
+"change display name" => "промени име за приказ",
+"set new password" => "постави нову лозинку",
+"Default" => "Подразумевано"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index ceff45a1595a9f07786d00b21a1fe91b208a5be1..db4f63d22197bf8cac1f5e595a528ecff70af2a9 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
-"Authentication error" => "Autentiseringsfel",
+"Authentication error" => "Fel vid autentisering",
 "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",
@@ -42,14 +42,22 @@
 "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.",
+"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.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Använd system-tjänsten cron. Anropa filen cron.php i ownCloud-mappen via ett cronjobb varje minut.",
 "Sharing" => "Dela",
+"Enable Share API" => "Aktivera delat API",
+"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
 "Allow links" => "Tillåt länkar",
+"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
 "Allow resharing" => "Tillåt vidaredelning",
 "Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
 "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",
 "Log" => "Logg",
+"Log level" => "Nivå på loggning",
 "More" => "Mer",
 "Less" => "Mindre",
 "Version" => "Version",
@@ -76,9 +84,6 @@
 "New password" => "Nytt lösenord",
 "Change password" => "Ändra lösenord",
 "Display Name" => "Visat namn",
-"Your display name was changed" => "Ditt visningsnamn har ändrats",
-"Unable to change your display name" => "Kan inte ändra ditt visningsnamn",
-"Change display name" => "Ändra 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",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 12aa756320041ca5cc500291e33eaf7b542749a2..052bb823655caa4a2c1eb775c1a5eac9e913336c 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -13,13 +13,13 @@
 "Unable to add user to group %s" => "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
 "Unable to remove user from group %s" => "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
 "Disable" => "இயலுமைப்ப",
-"Enable" => "செயலற்றதாக்குக",
+"Enable" => "இயலுமைப்படுத்துக",
 "Error" => "வழு",
-"Saving..." => "இயலுமைப்படுத்துக",
+"Saving..." => "சேமிக்கப்படுகிறது...",
 "undo" => "முன் செயல் நீக்கம் ",
 "Groups" => "குழுக்கள்",
 "Group Admin" => "குழு நிர்வாகி",
-"Delete" => "அழிக்க",
+"Delete" => "நீக்குக",
 "__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 கோப்பு வேலை செய்யவில்லை. தரவு அடைவை நீண்ட நேரத்திற்கு அணுகக்கூடியதாக உங்களுடைய வலைய சேவையகத்தை தகவமைக்குமாறு நாங்கள் உறுதியாக கூறுகிறோம் அல்லது தரவு அடைவை வலைய சேவையக மூல ஆவணத்திலிருந்து வெளியே அகற்றுக.  ",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index f2bd27720f1372919a021f2f53ff9c67f05585b0..998e457778591b616e80d774f13aad9c741c0be0 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
-"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
+"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
 "Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
 "Could not enable app. " => "ไม่สามารถเปิดใช้งานแอปได้",
@@ -22,7 +22,7 @@
 "Updating...." => "กำลังอัพเดทข้อมูล...",
 "Error while updating app" => "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
 "Updated" => "อัพเดทแล้ว",
-"Saving..." => "กำลังบันทึุกข้อมูล...",
+"Saving..." => "กำลังบันทึกข้อมูล...",
 "deleted" => "ลบแล้ว",
 "undo" => "เลิกทำ",
 "Groups" => "กลุ่ม",
@@ -31,6 +31,21 @@
 "__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 มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
+"Cron" => "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 เรียกหน้าเว็บ cron.php ที่ตำแหน่ง root ของ owncloud หลังจากนี้สักครู่ผ่านทาง http",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "ใช้บริการ cron จากระบบ เรียกไฟล์ cron.php ในโฟลเดอร์ owncloud ผ่านทาง cronjob ของระบบหลังจากนี้สักครู่",
+"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" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
+"Log" => "บันทึกการเปลี่ยนแปลง",
+"Log level" => "ระดับการเก็บบันทึก log",
 "More" => "มาก",
 "Less" => "น้อย",
 "Version" => "รุ่น",
@@ -56,7 +71,7 @@
 "New password" => "รหัสผ่านใหม่",
 "Change password" => "เปลี่ยนรหัสผ่าน",
 "Display Name" => "ชื่อที่ต้องการแสดง",
-"Email" => "อีเมล์",
+"Email" => "อีเมล",
 "Your email address" => "ที่อยู่อีเมล์ของคุณ",
 "Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
 "Language" => "ภาษา",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 1bd9dc3daccc41a55978c8c3907a939ea41df43d..0a803d64ec0643951133a70e75f30fa1100b7807 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
-"Authentication error" => "EÅŸleÅŸme hata",
+"Authentication error" => "Kimlik doğrulama hatası",
+"Your display name has been changed." => "Görüntülenen isminiz değiştirildi.",
 "Unable to change display name" => "Ekran adı değiştirilemiyor",
 "Group already exists" => "Grup zaten mevcut",
 "Unable to add group" => "Gruba eklenemiyor",
@@ -17,7 +18,7 @@
 "Couldn't update app." => "Uygulama güncellenemedi.",
 "Update to {appversion}" => "{appversion} Güncelle",
 "Disable" => "Etkin deÄŸil",
-"Enable" => "Etkin",
+"Enable" => "EtkinleÅŸtir",
 "Please wait...." => "Lütfen bekleyin....",
 "Error" => "Hata",
 "Updating...." => "Güncelleniyor....",
@@ -91,9 +92,6 @@
 "New password" => "Yeni parola",
 "Change password" => "Parola deÄŸiÅŸtir",
 "Display Name" => "Ekran Adı",
-"Your display name was changed" => "Ekran adınız değiştirildi",
-"Unable to change your display name" => "Ekran adınız değiştirilemiyor",
-"Change display name" => "Ekran adını değiştir",
 "Email" => "Eposta",
 "Your email address" => "Eposta adresiniz",
 "Fill in an email address to enable password recovery" => "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e8c17f0d363a38963adce7c5b7acd6558bfb5d3
--- /dev/null
+++ b/settings/l10n/ug.php
@@ -0,0 +1,71 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from 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. " => "ئەپنى قوزغىتالمىدى. ",
+"Email saved" => "تورخەت ساقلاندى",
+"Invalid email" => "ئىناۋەتسىز تورخەت",
+"Unable to delete group" => "گۇرۇپپىنى ئۆچۈرەلمىدى",
+"Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
+"Language changed" => "تىل ئۆزگەردى",
+"Invalid request" => "ئىناۋەتسىز ئىلتىماس",
+"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" => "گۇرۇپپا قوش",
+"Sharing" => "ھەمبەھىر",
+"Security" => "بىخەتەرلىك",
+"Log" => "خاتىرە",
+"Log level" => "خاتىرە دەرىجىسى",
+"More" => "تېخىمۇ كۆپ",
+"Less" => "ئاز",
+"Version" => "نەشرى",
+"Add your App" => "ئەپىڭىزنى قوشۇڭ",
+"More Apps" => "تېخىمۇ كۆپ ئەپلەر",
+"Select an App" => "بىر ئەپ تاللاڭ",
+"Update" => "يېڭىلا",
+"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
+"Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
+"Online Documentation" => "توردىكى قوللانما",
+"Forum" => "مۇنبەر",
+"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",
+"Login Name" => "تىزىمغا كىرىش ئاتى",
+"Create" => "قۇر",
+"Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
+"Unlimited" => "چەكسىز",
+"Other" => "باشقا",
+"Storage" => "ساقلىغۇچ",
+"change display name" => "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت",
+"set new password" => "يېڭى ئىم تەڭشە",
+"Default" => "كۆڭۈلدىكى"
+);
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 4618a86ceb1c8f720a8387503de94830673ef7e9..d2b51e853f2963710926748a25fc4040d2da4bb9 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -10,7 +10,7 @@
 "Unable to delete group" => "Не вдалося видалити групу",
 "Unable to delete user" => "Не вдалося видалити користувача",
 "Language changed" => "Мова змінена",
-"Invalid request" => "Помилковий запит",
+"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",
@@ -91,9 +91,6 @@
 "New password" => "Новий пароль",
 "Change password" => "Змінити пароль",
 "Display Name" => "Показати Ім'я",
-"Your display name was changed" => "Ваше ім'я було змінене",
-"Unable to change your display name" => "Неможливо змінити ваше зображене ім'я",
-"Change display name" => "Змінити зображене ім'я",
 "Email" => "Ел.пошта",
 "Your email address" => "Ваша адреса електронної пошти",
 "Fill in an email address to enable password recovery" => "Введіть адресу електронної пошти для відновлення паролю",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 156aae50e3f8a30de80525abaef933884570f63c..c9f7cd8633db30a4aa32a034f13ccce8ef1dd5ae 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -23,7 +23,7 @@
 "Updating...." => "Đang cập nhật...",
 "Error while updating app" => "Lỗi khi cập nhật ứng dụng",
 "Updated" => "Đã cập nhật",
-"Saving..." => "Đang tiến hành lưu ...",
+"Saving..." => "Đang lưu...",
 "deleted" => "đã xóa",
 "undo" => "lùi lại",
 "Groups" => "Nhóm",
@@ -32,6 +32,20 @@
 "__language_name__" => "__Ngôn ngữ___",
 "Security Warning" => "Cảnh bảo bảo mật",
 "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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ mạng. Tập tin .htaccess do ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ web để thư mục dữ liệu không còn bị truy cập hoặc bạn nên di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php đã được đăng ký tại một dịch vụ webcron. Gọi trang cron.php mỗi phút một lần thông qua giao thức http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Sử dụng dịch vụ cron của hệ thống. Gọi tệp tin cron.php mỗi phút một lần.",
+"Sharing" => "Chia sẻ",
+"Enable Share API" => "Bật chia sẻ API",
+"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
+"Allow links" => "Cho phép liên kết",
+"Allow users to share items to the public with links" => "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết",
+"Allow resharing" => "Cho phép chia sẻ lại",
+"Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
+"Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
+"Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
+"Log" => "Log",
 "More" => "hơn",
 "Less" => "ít",
 "Version" => "Phiên bản",
@@ -55,12 +69,9 @@
 "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",
 "Current password" => "Mật khẩu cũ",
-"New password" => "Mật khẩu mới ",
+"New password" => "Mật khẩu mới",
 "Change password" => "Đổi mật khẩu",
 "Display Name" => "Tên hiển thị",
-"Your display name was changed" => "Tên hiển thị của bạn đã được thay đổi",
-"Unable to change your display name" => "Không thể thay đổi tên hiển thị của bạn",
-"Change display name" => "Thay đổi tên hiển thị",
 "Email" => "Email",
 "Your email address" => "Email của bạn",
 "Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index e8b1527ef0e8fff12efb03ec81b0ffc254718c02..e2f59e72d0fc6a7489a3c8353004a9528d2bc7c5 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "不能从App Store 中加载列表",
-"Authentication error" => "认证错误",
+"Authentication error" => "验证错误",
 "Unable to change display name" => "无法更改显示名称",
 "Group already exists" => "群组已存在",
 "Unable to add group" => "未能添加群组",
@@ -27,7 +27,7 @@
 "deleted" => "删除",
 "undo" => "撤销",
 "Unable to remove user" => "无法移除用户",
-"Groups" => "组",
+"Groups" => "群组",
 "Group Admin" => "群组管理员",
 "Delete" => "删除",
 "add group" => "添加群组",
@@ -43,6 +43,10 @@
 "Locale not working" => "区域设置未运作",
 "Internet connection not working" => "互联网连接未运作",
 "Cron" => "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 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 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",
+"Sharing" => "分享",
 "Enable Share API" => "开启分享API",
 "Allow apps to use the Share API" => "允许应用使用分享API",
 "Allow links" => "允许链接",
@@ -54,6 +58,7 @@
 "Security" => "安全",
 "Enforce HTTPS" => "强制HTTPS",
 "Enforces the clients to connect to ownCloud via an encrypted connection." => "强制客户端通过加密连接与ownCloud连接",
+"Log" => "日志",
 "More" => "更多",
 "Less" => "æ›´å°‘",
 "Version" => "版本",
@@ -80,10 +85,7 @@
 "New password" => "新密码",
 "Change password" => "改变密码",
 "Display Name" => "显示名称",
-"Your display name was changed" => "您的显示名称已修改",
-"Unable to change your display name" => "无法修改您的显示名称",
-"Change display name" => "更改显示名称",
-"Email" => "Email",
+"Email" => "电子邮件",
 "Your email address" => "你的email地址",
 "Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
 "Language" => "语言",
@@ -94,7 +96,7 @@
 "Create" => "新建",
 "Default Storage" => "默认容量",
 "Unlimited" => "无限制",
-"Other" => "其他的",
+"Other" => "其他",
 "Storage" => "容量",
 "change display name" => "更改显示名称",
 "set new password" => "设置新的密码",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index b076044b82acaadccd8f37a3afa131a73e82e480..1ec0b004c60d84ac985460979de533a1b8b21ed1 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
-"Authentication error" => "认证错误",
+"Authentication error" => "认证出错",
+"Your display name has been changed." => "您的显示名字已经改变",
 "Unable to change display name" => "无法修改显示名称",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
@@ -10,20 +11,20 @@
 "Unable to delete group" => "无法删除组",
 "Unable to delete user" => "无法删除用户",
 "Language changed" => "语言已修改",
-"Invalid request" => "非法请求",
+"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中移除用户",
 "Couldn't update app." => "无法更新 app。",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "禁用",
-"Enable" => "启用",
+"Enable" => "开启",
 "Please wait...." => "请稍等....",
 "Error" => "错误",
 "Updating...." => "正在更新....",
 "Error while updating app" => "更新 app 时出错",
 "Updated" => "已更新",
-"Saving..." => "正在保存",
+"Saving..." => "保存中",
 "deleted" => "已经删除",
 "undo" => "撤销",
 "Unable to remove user" => "无法移除用户",
@@ -91,9 +92,6 @@
 "New password" => "新密码",
 "Change password" => "修改密码",
 "Display Name" => "显示名称",
-"Your display name was changed" => "您的显示名称已修改",
-"Unable to change your display name" => "无法修改您的显示名称",
-"Change display name" => "修改显示名称",
 "Email" => "电子邮件",
 "Your email address" => "您的电子邮件",
 "Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index b5eb115f91251b9114c64d4621e21444839be990..aca20f15e5c2dc8f6f3a705e30563ff0d2c09d72 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.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" => "群組增加失敗",
@@ -37,13 +38,20 @@
 "__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." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
+"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-type 支援。",
+"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 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 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 呼叫 ownCloud 根目錄當中的 cron.php 一次。",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "使用系統的 cron 服務，每分鐘執行一次 owncloud 資料夾中的 cron.php 。",
+"Sharing" => "分享",
 "Enable Share API" => "啟用分享 API",
 "Allow apps to use the Share API" => "允許 apps 使用分享 API",
 "Allow links" => "允許連結",
@@ -75,27 +83,25 @@
 "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" => "獲取那些同步您的文件的應用程序",
+"Get the apps to sync your files" => "下載應用程式來同步您的檔案",
 "Show First Run Wizard again" => "再次顯示首次使用精靈",
 "Password" => "密碼",
 "Your password was changed" => "你的密碼已更改",
-"Unable to change your password" => "無法變更你的密碼",
+"Unable to change your password" => "無法變更您的密碼",
 "Current password" => "目前密碼",
 "New password" => "新密碼",
 "Change password" => "變更密碼",
 "Display Name" => "顯示名稱",
-"Your display name was changed" => "已更改顯示名稱",
-"Unable to change your display name" => "無法更改您的顯示名稱",
-"Change display name" => "更改顯示名稱",
-"Email" => "電子郵件",
-"Your email address" => "你的電子郵件信箱",
+"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" => "創造",
+"Create" => "建立",
+"Admin Recovery Password" => "管理者復原密碼",
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index c25fbb434a706b03c75190ad0b2f67a7bf677e55..40213b3a7e5edca6f9a9a64bc6db9f417c247e7d 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -34,7 +34,7 @@ return array(
 'sr'=>'Српски',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'中文',
+'zh_CN'=>'简体中文',
 'sk_SK'=>'Slovenčina',
 'hu_HU'=>'Magyar',
 'eu'=>'Euskara',
@@ -51,11 +51,11 @@ return array(
 'mk'=>'македонски',
 'uk'=>'Українська',
 'vi'=>'Tiếng Việt',
-'zh_TW'=>'臺灣話',
+'zh_TW'=>'正體中文（臺灣）',
 'af_ZA'=> 'Afrikaans',
 'bn_BD'=>'Bengali',
 'ta_LK'=>'தமிழ்',
-'zh_HK'=>'Chinese (Hong Kong)',
+'zh_HK'=>'繁體中文（香港）',
 'oc'=>'Occitan (post 1500)',
 'is'=>'Icelandic',
 'pl_PL'=>'Polski',
diff --git a/settings/personal.php b/settings/personal.php
index 9bbc66c9b7fcf644f61713b9cfa596a84b701ff4..cab6e56dada3a43c1ccc19cec6e57b90d3fbf959 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -22,8 +22,14 @@ $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 $userLang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 
+// array of common languages
+$commonlangcodes = array(
+	'en', 'es', 'fr', 'de', 'de_DE', 'ja_JP', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'zh_CN', 'ko'
+);
+
 $languageNames=include 'languageCodes.php';
 $languages=array();
+$commonlanguages = array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
@@ -34,21 +40,24 @@ foreach($languageCodes as $lang) {
 		$ln=array('code'=>$lang, 'name'=>$lang);
 	}
 
+	// put apropriate languages into apropriate arrays, to print them sorted
+	// used language -> common languages -> divider -> other languages
 	if ($lang === $userLang) {
 		$userLang = $ln;
+	} elseif (in_array($lang, $commonlangcodes)) {
+		$commonlanguages[array_search($lang, $commonlangcodes)]=$ln;
 	} else {
 		$languages[]=$ln;
 	}
 }
 
+ksort($commonlanguages);
+
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
 	return strcmp($a['name'], $b['name']);
 });
 
-//put the current language in the front
-array_unshift($languages, $userLang);
-
 //links to clients
 $clients = array(
 	'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
@@ -64,6 +73,8 @@ $tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('clients', $clients);
 $tmpl->assign('email', $email);
 $tmpl->assign('languages', $languages);
+$tmpl->assign('commonlanguages', $commonlanguages);
+$tmpl->assign('activelanguage', $userLang);
 $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index fdaba95ac1718a73ba99414f15dfa71d364e6457..28254b7aa1844a5c5d9ebbb8cb51f3ca9c6314a6 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -214,7 +214,11 @@ endfor;?>
 				<?php p($entry->message);?>
 			</td>
 			<td>
-				<?php p(OC_Util::formatDate($entry->time));?>
+				<?php if(is_int($entry->time)){
+					p(OC_Util::formatDate($entry->time)); 
+				} else {
+					p($entry->time);
+				}?>
 			</td>
 		</tr>
 		<?php endforeach;?>
@@ -229,8 +233,7 @@ endfor;?>
 
 <fieldset class="personalblock">
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
-	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?>
-	(<?php print_unescaped(OC_Updater::ShowUpdatingHint()); ?>)<br/>
+	<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>.')); ?>
 </fieldset>
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 03073069ab77688cd3888cbc45d56785b529317d..f0002c505c801a13fe51d2497e35a5fbab52f479 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -38,7 +38,7 @@ if($_['passwordChangeSupported']) {
 		<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
 		<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
-		<input type="password" id="pass2" name="new-password"
+		<input type="password" id="pass2" name="password"
 			placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
 		<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
 		<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
@@ -54,17 +54,18 @@ if($_['displayNameChangeSupported']) {
 <form id="displaynameform">
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('Display Name');?></strong></legend>
-		<div id="displaynamechanged"><?php p($l->t('Your display name was changed'));?></div>
-		<div id="displaynameerror"><?php p($l->t('Unable to change your display name'));?></div>
 		<input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" />
+        <span class="msg"></span>
 		<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />
-		<input id="displaynamebutton" type="submit" value="<?php p($l->t('Change display name'));?>" />
 	</fieldset>
 </form>
 <?php
 }
 ?>
 
+<?php
+if($_['passwordChangeSupported']) {
+?>
 <form id="lostpassword">
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Email'));?></strong></legend>
@@ -73,16 +74,24 @@ if($_['displayNameChangeSupported']) {
 		<em><?php p($l->t('Fill in an email address to enable password recovery'));?></em>
 	</fieldset>
 </form>
+<?php
+}
+?>
 
 <form>
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Language'));?></strong></legend>
 		<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
+		<option value="<?php p($_['activelanguage']['code']);?>"><?php p($_['activelanguage']['name']);?></option>
+		<?php foreach($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
+		<?php endforeach;?>
+		<optgroup label="––––––––––"><option class="languagedivider">-</option></optgroup>
 		<?php foreach($_['languages'] as $language):?>
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>
 		</select>
-		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['languages'][0]['code']);?>/"
+		<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>
 	</fieldset>
 </form>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 6113337f4eeb2ed916b1d4d558b975c43e0ffb16..a6df85983dd6c52e7ac67c10ae93c3fce7bb0c11 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -25,12 +25,15 @@ $_['subadmingroups'] = array_flip($items);
 			id="newusergroups" data-placeholder="groups"
 			title="<?php p($l->t('Groups'))?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php p($group['name']);?>">
-				<?php p($group['name']);?>
-			</option>
+			<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
 			<?php endforeach;?>
 		</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
 	</form>
+	<?php if((bool)$_['recoveryAdminEnabled']): ?>
+	<div class="recoveryPassword">
+	<input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" />
+	</div>
+	<?php endif; ?>
 	<div class="quota">
 		<span><?php p($l->t('Default Storage'));?></span>
 			<?php if((bool) $_['isadmin']): ?>
@@ -105,9 +108,7 @@ $_['subadmingroups'] = array_flip($items);
 				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
 				multiple="multiple">
 					<?php foreach($_["groups"] as $group): ?>
-					<option value="<?php p($group['name']);?>">
-						<?php p($group['name']);?>
-					</option>
+					<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
 					<?php endforeach;?>
 			</select>
 			</td>
@@ -119,9 +120,7 @@ $_['subadmingroups'] = array_flip($items);
 				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
 				multiple="multiple">
 					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php p($group);?>">
-						<?php p($group);?>
-					</option>
+					<option value="<?php p($group);?>"><?php p($group);?></option>
 					<?php endforeach;?>
 			</select>
 			</td>
diff --git a/settings/users.php b/settings/users.php
index 94e6d0a9a10f9ee5751b7d5b645692642a0c5871..e5c8a7aaa8d2963f6aab0dae4ddc57c689dbab36 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -20,6 +20,8 @@ $users = array();
 $groups = array();
 
 $isadmin = OC_User::isAdminUser(OC_User::getUser());
+$recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
+					    OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
 
 if($isadmin) {
 	$accessiblegroups = OC_Group::getGroups();
@@ -77,4 +79,5 @@ $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
+$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
 $tmpl->printPage();
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 44af0115650dff1e6f52f756c96ae49b3bfc6067..111ed0e13572770ecbd170cf67bb498c973d4b33 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -8,6 +8,7 @@
 
 require_once __DIR__.'/../lib/base.php';
 
+OC_App::enable('files_encryption');
 OC_App::enable('calendar');
 OC_App::enable('contacts');
 OC_App::enable('apptemplateadvanced');
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index e769bf3bcf6950e1ee043f3b6552a137e6f8eb57..0e7d606ccf678b9baf752ea3cd5d001e76ad54ea 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -6,14 +6,69 @@
  * See the COPYING-README file.
  */
 
-class Test_AutoLoader extends PHPUnit_Framework_TestCase {
+namespace Test;
 
-	public function testLeadingSlashOnClassName(){
-		$this->assertTrue(class_exists('\OC\Files\Storage\Local'));
+class AutoLoader extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\Autoloader $loader
+	 */
+	private $loader;
+
+	public function setUp() {
+		$this->loader = new \OC\AutoLoader();
+	}
+
+	public function testLeadingSlashOnClassName() {
+		$this->assertEquals(array('files/storage/local.php'), $this->loader->findClass('\OC\Files\Storage\Local'));
+	}
+
+	public function testNoLeadingSlashOnClassName() {
+		$this->assertEquals(array('files/storage/local.php'), $this->loader->findClass('OC\Files\Storage\Local'));
+	}
+
+	public function testLegacyPath() {
+		$this->assertEquals(array('legacy/files.php', 'files.php'), $this->loader->findClass('OC_Files'));
+	}
+
+	public function testClassPath() {
+		$this->loader->registerClass('Foo\Bar', 'foobar.php');
+		$this->assertEquals(array('foobar.php'), $this->loader->findClass('Foo\Bar'));
+	}
+
+	public function testPrefixNamespace() {
+		$this->loader->registerPrefix('Foo', 'foo');
+		$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo\Bar'));
 	}
 
-	public function testNoLeadingSlashOnClassName(){
-		$this->assertTrue(class_exists('OC\Files\Storage\Local'));
+	public function testPrefix() {
+		$this->loader->registerPrefix('Foo_', 'foo');
+		$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo_Bar'));
 	}
 
+	public function testLoadTestNamespace() {
+		$this->assertEquals(array('tests/lib/foo/bar.php'), $this->loader->findClass('Test\Foo\Bar'));
+	}
+
+	public function testLoadTest() {
+		$this->assertEquals(array('tests/lib/foo/bar.php'), $this->loader->findClass('Test_Foo_Bar'));
+	}
+
+	public function testLoadCoreNamespace() {
+		$this->assertEquals(array('foo/bar.php'), $this->loader->findClass('OC\Foo\Bar'));
+	}
+
+	public function testLoadCore() {
+		$this->assertEquals(array('legacy/foo/bar.php', 'foo/bar.php'), $this->loader->findClass('OC_Foo_Bar'));
+	}
+
+	public function testLoadPublicNamespace() {
+		$this->assertEquals(array('public/foo/bar.php'), $this->loader->findClass('OCP\Foo\Bar'));
+	}
+
+	public function testLoadAppNamespace() {
+		$result = $this->loader->findClass('OCA\Files\Foobar');
+		$this->assertEquals(2, count($result));
+		$this->assertStringEndsWith('apps/files/foobar.php', $result[0]);
+		$this->assertStringEndsWith('apps/files/lib/foobar.php', $result[1]);
+	}
 }
diff --git a/tests/lib/backgroundjob/dummyjoblist.php b/tests/lib/backgroundjob/dummyjoblist.php
new file mode 100644
index 0000000000000000000000000000000000000000..d91d6b344b5f05d2c8410675c0d15970b299a064
--- /dev/null
+++ b/tests/lib/backgroundjob/dummyjoblist.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class JobRun extends \Exception {
+}
+
+/**
+ * Class DummyJobList
+ *
+ * in memory job list for testing purposes
+ */
+class DummyJobList extends \OC\BackgroundJob\JobList {
+	/**
+	 * @var \OC\BackgroundJob\Job[]
+	 */
+	private $jobs = array();
+
+	private $last = 0;
+
+	/**
+	 * @param \OC\BackgroundJob\Job|string $job
+	 * @param mixed $argument
+	 */
+	public function add($job, $argument = null) {
+		$job->setArgument($argument);
+		if (!$this->has($job, null)) {
+			$this->jobs[] = $job;
+		}
+	}
+
+	/**
+	 * @param \OC\BackgroundJob\Job|string $job
+	 * @param mixed $argument
+	 */
+	public function remove($job, $argument = null) {
+		$index = array_search($job, $this->jobs);
+		if ($index !== false) {
+			unset($this->jobs[$index]);
+		}
+	}
+
+	/**
+	 * check if a job is in the list
+	 *
+	 * @param $job
+	 * @param mixed $argument
+	 * @return bool
+	 */
+	public function has($job, $argument) {
+		return array_search($job, $this->jobs) !== false;
+	}
+
+	/**
+	 * get all jobs in the list
+	 *
+	 * @return \OC\BackgroundJob\Job[]
+	 */
+	public function getAll() {
+		return $this->jobs;
+	}
+
+	/**
+	 * get the next job in the list
+	 *
+	 * @return \OC\BackgroundJob\Job
+	 */
+	public function getNext() {
+		if (count($this->jobs) > 0) {
+			if ($this->last < (count($this->jobs) - 1)) {
+				$i = $this->last + 1;
+			} else {
+				$i = 0;
+			}
+			return $this->jobs[$i];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * set the job that was last ran
+	 *
+	 * @param \OC\BackgroundJob\Job $job
+	 */
+	public function setLastJob($job) {
+		$i = array_search($job, $this->jobs);
+		if ($i !== false) {
+			$this->last = $i;
+		} else {
+			$this->last = 0;
+		}
+	}
+
+	/**
+	 * @param int $id
+	 * @return Job
+	 */
+	public function getById($id) {
+		foreach ($this->jobs as $job) {
+			if ($job->getId() === $id) {
+				return $job;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * get the id of the last ran job
+	 *
+	 * @return int
+	 */
+	public function getLastJob() {
+		return $this->last;
+	}
+
+	/**
+	 * set the lastRun of $job to now
+	 *
+	 * @param \OC\BackgroundJob\Job $job
+	 */
+	public function setLastRun($job) {
+		$job->setLastRun(time());
+	}
+}
diff --git a/tests/lib/backgroundjob/queuedjob.php b/tests/lib/backgroundjob/queuedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d373473cd7ae1b7e5c0469363e7fbe519fa042c
--- /dev/null
+++ b/tests/lib/backgroundjob/queuedjob.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class TestQueuedJob extends \OC\BackgroundJob\QueuedJob {
+	public function run($argument) {
+		throw new JobRun(); //throw an exception so we can detect if this function is called
+	}
+}
+
+class QueuedJob extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var DummyJobList $jobList
+	 */
+	private $jobList;
+	/**
+	 * @var \OC\BackgroundJob\TimedJob $job
+	 */
+	private $job;
+
+	public function setup() {
+		$this->jobList = new DummyJobList();
+		$this->job = new TestQueuedJob();
+		$this->jobList->add($this->job);
+	}
+
+	public function testJobShouldBeRemoved() {
+		try {
+			$this->assertTrue($this->jobList->has($this->job, null));
+			$this->job->execute($this->jobList);
+			$this->fail("job should have been run");
+		} catch (JobRun $e) {
+			$this->assertFalse($this->jobList->has($this->job, null));
+		}
+	}
+}
diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php
new file mode 100644
index 0000000000000000000000000000000000000000..0af933afef873adea45a7e3bfb84557ccac433fa
--- /dev/null
+++ b/tests/lib/backgroundjob/timedjob.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class TestTimedJob extends \OC\BackgroundJob\TimedJob {
+	public function __construct() {
+		$this->setInterval(10);
+	}
+
+	public function run($argument) {
+		throw new JobRun(); //throw an exception so we can detect if this function is called
+	}
+}
+
+class TimedJob extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var DummyJobList $jobList
+	 */
+	private $jobList;
+	/**
+	 * @var \OC\BackgroundJob\TimedJob $job
+	 */
+	private $job;
+
+	public function setup() {
+		$this->jobList = new DummyJobList();
+		$this->job = new TestTimedJob();
+		$this->jobList->add($this->job);
+	}
+
+	public function testShouldRunAfterInterval() {
+		$this->job->setLastRun(time() - 12);
+		try {
+			$this->job->execute($this->jobList);
+			$this->fail("job should have run");
+		} catch (JobRun $e) {
+		}
+	}
+
+	public function testShouldNotRunWithinInterval() {
+		$this->job->setLastRun(time() - 5);
+		try {
+			$this->job->execute($this->jobList);
+		} catch (JobRun $e) {
+			$this->fail("job should not have run");
+		}
+	}
+
+	public function testShouldNotTwice() {
+		$this->job->setLastRun(time() - 15);
+		try {
+			$this->job->execute($this->jobList);
+			$this->fail("job should have run the first time");
+		} catch (JobRun $e) {
+			try {
+				$this->job->execute($this->jobList);
+			} catch (JobRun $e) {
+				$this->fail("job should not have run the second time");
+			}
+		}
+	}
+}
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 5dcd3268804065bf4fd6fae79df87866eca76092..038cb21b2576a54ac1b76d635a3279951a0a94d5 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -22,7 +22,8 @@
 
 class Test_Cache_File extends Test_Cache {
 	private $user;
-	
+	private $datadir;
+
 	function skip() {
 		//$this->skipUnless(OC_User::isLoggedIn());
 	}
@@ -31,15 +32,20 @@ class Test_Cache_File extends Test_Cache {
 		//clear all proxies and hooks so we can do clean testing
 		OC_FileProxy::clearProxies();
 		OC_Hook::clear('OC_Filesystem');
-		
+
+		//disabled atm
 		//enable only the encryption hook if needed
-		if(OC_App::isEnabled('files_encryption')) {
-			OC_FileProxy::register(new OC_FileProxy_Encryption());
-		}
-		
+		//if(OC_App::isEnabled('files_encryption')) {
+		//	OC_FileProxy::register(new OC_FileProxy_Encryption());
+		//}
+
 		//set up temporary storage
 		\OC\Files\Filesystem::clearMounts();
-		\OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/');
+		$storage = new \OC\Files\Storage\Temporary(array());
+		\OC\Files\Filesystem::mount($storage,array(),'/');
+		$datadir = str_replace('local::', '', $storage->getId());
+		$this->datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
+		OC_Config::setValue('datadirectory', $datadir);
 
 		OC_User::clearBackends();
 		OC_User::useBackend(new OC_User_Dummy());
@@ -59,5 +65,6 @@ class Test_Cache_File extends Test_Cache {
 
 	public function tearDown() {
 		OC_User::setUserId($this->user);
+		OC_Config::setValue('datadirectory', $this->datadir);
 	}
 }
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 250842805e5d32072fc253a5c6fc892baf008594..f272655925b6633fdf7a4226f9f70140e8001c63 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -8,6 +8,8 @@
 
 namespace Test\Files\Cache;
 
+use PHPUnit_Framework_MockObject_MockObject;
+
 class LongId extends \OC\Files\Storage\Temporary {
 	public function getId() {
 		return 'long:' . str_repeat('foo', 50) . parent::getId();
@@ -19,11 +21,19 @@ class Cache extends \PHPUnit_Framework_TestCase {
 	 * @var \OC\Files\Storage\Temporary $storage;
 	 */
 	private $storage;
+	/**
+	 * @var \OC\Files\Storage\Temporary $storage2;
+	 */
+	private $storage2;
 
 	/**
 	 * @var \OC\Files\Cache\Cache $cache
 	 */
 	private $cache;
+	/**
+	 * @var \OC\Files\Cache\Cache $cache2
+	 */
+	private $cache2;
 
 	public function testSimple() {
 		$file1 = 'foo';
@@ -162,13 +172,21 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$file4 = 'folder/foo/1';
 		$file5 = 'folder/foo/2';
 		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/bar');
+		$folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
 
-		$this->cache->put($file1, $data);
-		$this->cache->put($file2, $data);
-		$this->cache->put($file3, $data);
+		$this->cache->put($file1, $folderData);
+		$this->cache->put($file2, $folderData);
+		$this->cache->put($file3, $folderData);
 		$this->cache->put($file4, $data);
 		$this->cache->put($file5, $data);
 
+		/* simulate a second user with a different storage id but the same folder structure */
+		$this->cache2->put($file1, $folderData);
+		$this->cache2->put($file2, $folderData);
+		$this->cache2->put($file3, $folderData);
+		$this->cache2->put($file4, $data);
+		$this->cache2->put($file5, $data);
+
 		$this->cache->move('folder/foo', 'folder/foobar');
 
 		$this->assertFalse($this->cache->inCache('folder/foo'));
@@ -179,6 +197,16 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($this->cache->inCache('folder/foobar'));
 		$this->assertTrue($this->cache->inCache('folder/foobar/1'));
 		$this->assertTrue($this->cache->inCache('folder/foobar/2'));
+
+		/* the folder structure of the second user must not change! */
+		$this->assertTrue($this->cache2->inCache('folder/bar'));
+		$this->assertTrue($this->cache2->inCache('folder/foo'));
+		$this->assertTrue($this->cache2->inCache('folder/foo/1'));
+		$this->assertTrue($this->cache2->inCache('folder/foo/2'));
+
+		$this->assertFalse($this->cache2->inCache('folder/foobar'));
+		$this->assertFalse($this->cache2->inCache('folder/foobar/1'));
+		$this->assertFalse($this->cache2->inCache('folder/foobar/2'));
 	}
 
 	function testGetIncomplete() {
@@ -210,6 +238,23 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array($storageId, 'foo'), \OC\Files\Cache\Cache::getById($id));
 	}
 
+	function testStorageMTime() {
+		$data = array('size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file');
+		$this->cache->put('foo', $data);
+		$cachedData = $this->cache->get('foo');
+		$this->assertEquals($data['mtime'], $cachedData['storage_mtime']);//if no storage_mtime is saved, mtime should be used
+
+		$this->cache->put('foo', array('storage_mtime' => 30));//when setting storage_mtime, mtime is also set
+		$cachedData = $this->cache->get('foo');
+		$this->assertEquals(30, $cachedData['storage_mtime']);
+		$this->assertEquals(30, $cachedData['mtime']);
+
+		$this->cache->put('foo', array('mtime' => 25));//setting mtime does not change storage_mtime
+		$cachedData = $this->cache->get('foo');
+		$this->assertEquals(30, $cachedData['storage_mtime']);
+		$this->assertEquals(25, $cachedData['mtime']);
+	}
+
 	function testLongId() {
 		$storage = new LongId(array());
 		$cache = $storage->getCache();
@@ -219,12 +264,97 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(md5($storageId), 'foo'), \OC\Files\Cache\Cache::getById($id));
 	}
 
+	/**
+	 * @brief this test show the bug resulting if we have no normalizer installed
+	 */
+	public function testWithoutNormalizer() {
+		// folder name "Schön" with U+00F6 (normalized)
+		$folderWith00F6 = "\x53\x63\x68\xc3\xb6\x6e";
+
+		// folder name "Schön" with U+0308 (un-normalized)
+		$folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e";
+
+		/**
+		 * @var \OC\Files\Cache\Cache | PHPUnit_Framework_MockObject_MockObject $cacheMock
+		 */
+		$cacheMock = $this->getMock('\OC\Files\Cache\Cache', array('normalize'), array($this->storage), '', true);
+
+		$cacheMock->expects($this->any())
+			->method('normalize')
+			->will($this->returnArgument(0));
+
+		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
+
+		// put root folder
+		$this->assertFalse($cacheMock->get('folder'));
+		$this->assertGreaterThan(0, $cacheMock->put('folder', $data));
+
+		// put un-normalized folder
+		$this->assertFalse($cacheMock->get('folder/' .$folderWith0308));
+		$this->assertGreaterThan(0, $cacheMock->put('folder/' .$folderWith0308, $data));
+
+		// get un-normalized folder by name
+		$unNormalizedFolderName = $cacheMock->get('folder/' .$folderWith0308);
+
+		// check if database layer normalized the folder name (this should not happen)
+		$this->assertEquals($folderWith0308, $unNormalizedFolderName['name']);
+
+		// put normalized folder
+		$this->assertFalse($cacheMock->get('folder/' . $folderWith00F6));
+		$this->assertGreaterThan(0, $cacheMock->put('folder/' .$folderWith00F6, $data));
+
+		// this is our bug, we have two different hashes with the same name (Schön)
+		$this->assertEquals(2, count($cacheMock->getFolderContents('folder')));
+	}
+
+	/**
+	 * @brief this test shows that there is no bug if we use the normalizer
+	 */
+	public function testWithNormalizer() {
+
+		if(!class_exists('Patchwork\PHP\Shim\Normalizer')) {
+			$this->markTestSkipped('The 3rdparty Normalizer extension is not available.');
+			return;
+		}
+
+		// folder name "Schön" with U+00F6 (normalized)
+		$folderWith00F6 = "\x53\x63\x68\xc3\xb6\x6e";
+
+		// folder name "Schön" with U+0308 (un-normalized)
+		$folderWith0308 = "\x53\x63\x68\x6f\xcc\x88\x6e";
+
+		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
+
+		// put root folder
+		$this->assertFalse($this->cache->get('folder'));
+		$this->assertGreaterThan(0, $this->cache->put('folder', $data));
+
+		// put un-normalized folder
+		$this->assertFalse($this->cache->get('folder/' .$folderWith0308));
+		$this->assertGreaterThan(0, $this->cache->put('folder/' .$folderWith0308, $data));
+
+		// get un-normalized folder by name
+		$unNormalizedFolderName = $this->cache->get('folder/' .$folderWith0308);
+
+		// check if folder name was normalized
+		$this->assertEquals($folderWith00F6, $unNormalizedFolderName['name']);
+
+		// put normalized folder
+		$this->assertTrue(is_array($this->cache->get('folder/' . $folderWith00F6)));
+		$this->assertGreaterThan(0, $this->cache->put('folder/' .$folderWith00F6, $data));
+
+		// at this point we should have only one folder named "Schön"
+		$this->assertEquals(1, count($this->cache->getFolderContents('folder')));
+	}
+
 	public function tearDown() {
 		$this->cache->clear();
 	}
 
 	public function setUp() {
 		$this->storage = new \OC\Files\Storage\Temporary(array());
+		$this->storage2 = new \OC\Files\Storage\Temporary(array());
 		$this->cache = new \OC\Files\Cache\Cache($this->storage);
+		$this->cache2 = new \OC\Files\Cache\Cache($this->storage2);
 	}
 }
diff --git a/tests/lib/files/cache/permissions.php b/tests/lib/files/cache/permissions.php
index 56dbbc4518ef3627d6f8b5964939822e794d92d2..7e6e11e2eb29c09e6fe9a5fdcf2dd293f7e82c98 100644
--- a/tests/lib/files/cache/permissions.php
+++ b/tests/lib/files/cache/permissions.php
@@ -14,8 +14,8 @@ class Permissions extends \PHPUnit_Framework_TestCase {
 	 */
 	private $permissionsCache;
 
-	function setUp(){
-		$this->permissionsCache=new \OC\Files\Cache\Permissions('dummy');
+	function setUp() {
+		$this->permissionsCache = new \OC\Files\Cache\Permissions('dummy');
 	}
 
 	function testSimple() {
@@ -23,8 +23,10 @@ class Permissions extends \PHPUnit_Framework_TestCase {
 		$user = uniqid();
 
 		$this->assertEquals(-1, $this->permissionsCache->get(1, $user));
+		$this->assertNotContains($user, $this->permissionsCache->getUsers(1));
 		$this->permissionsCache->set(1, $user, 1);
 		$this->assertEquals(1, $this->permissionsCache->get(1, $user));
+		$this->assertContains($user, $this->permissionsCache->getUsers(1));
 		$this->assertEquals(-1, $this->permissionsCache->get(2, $user));
 		$this->assertEquals(-1, $this->permissionsCache->get(1, $user . '2'));
 
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index aaf932c97feb88a086d4545e7c7b4bd44d348c70..dad3cd7e6503cf671375fd1049bc8b7cc3e3f9fa 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -42,14 +42,11 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->scanner->scan('');
 		$this->cache = $this->storage->getCache();
 
+		\OC\Files\Filesystem::tearDown();
 		if (!self::$user) {
-			if (!\OC\Files\Filesystem::getView()) {
-				self::$user = uniqid();
-				\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
-			} else {
-				self::$user = \OC_User::getUser();
-			}
+			self::$user = uniqid();
 		}
+		\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
 
 		Filesystem::clearMounts();
 		Filesystem::mount($this->storage, array(), '/' . self::$user . '/files');
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index 8ef6ab44d102f72349dc4d0c15092569933d8d15..e43c86ed4387636347dcb5e0a74acbd1bbb20ecb 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -35,7 +35,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		$updater = $storage->getWatcher();
 
 		//set the mtime to the past so it can detect an mtime change
-		$cache->put('', array('mtime' => 10));
+		$cache->put('', array('storage_mtime' => 10));
 
 		$this->assertTrue($cache->inCache('folder/bar.txt'));
 		$this->assertTrue($cache->inCache('folder/bar2.txt'));
@@ -47,14 +47,14 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		$cachedData = $cache->get('bar.test');
 		$this->assertEquals(3, $cachedData['size']);
 
-		$cache->put('bar.test', array('mtime' => 10));
+		$cache->put('bar.test', array('storage_mtime' => 10));
 		$storage->file_put_contents('bar.test', 'test data');
 
 		$updater->checkUpdate('bar.test');
 		$cachedData = $cache->get('bar.test');
 		$this->assertEquals(9, $cachedData['size']);
 
-		$cache->put('folder', array('mtime' => 10));
+		$cache->put('folder', array('storage_mtime' => 10));
 
 		$storage->unlink('folder/bar2.txt');
 		$updater->checkUpdate('folder');
@@ -69,7 +69,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		$updater = $storage->getWatcher();
 
 		//set the mtime to the past so it can detect an mtime change
-		$cache->put('', array('mtime' => 10));
+		$cache->put('', array('storage_mtime' => 10));
 
 		$storage->unlink('foo.txt');
 		$storage->rename('folder', 'foo.txt');
@@ -85,7 +85,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		$updater = $storage->getWatcher();
 
 		//set the mtime to the past so it can detect an mtime change
-		$cache->put('foo.txt', array('mtime' => 10));
+		$cache->put('foo.txt', array('storage_mtime' => 10));
 
 		$storage->unlink('foo.txt');
 		$storage->rename('folder', 'foo.txt');
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 6ce45e6178a7c15c9c43d9e1163a4484a702ef4a..bef70cc725b167c4ced0495c31638d8571f1a88c 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -72,7 +72,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('\path'));
 		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo//bar/'));
 		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo////bar'));
-		if (class_exists('Normalizer')) {
+		if (class_exists('Patchwork\PHP\Shim\Normalizer')) {
 			$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88"));
 		}
 	}
diff --git a/tests/lib/files/mount.php b/tests/lib/files/mount.php
deleted file mode 100644
index a3dc06cc66887b7a8cd7f3d111b1f3b45337432d..0000000000000000000000000000000000000000
--- a/tests/lib/files/mount.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace Test\Files;
-
-use \OC\Files\Storage\Temporary;
-
-class LongId extends Temporary {
-	public function getId() {
-		return 'long:' . str_repeat('foo', 50) . parent::getId();
-	}
-}
-
-class Mount extends \PHPUnit_Framework_TestCase {
-	public function setup() {
-		\OC_Util::setupFS();
-		\OC\Files\Mount::clear();
-	}
-
-	public function testFind() {
-		$this->assertNull(\OC\Files\Mount::find('/'));
-
-		$rootMount = new \OC\Files\Mount(new Temporary(array()), '/');
-		$this->assertEquals($rootMount, \OC\Files\Mount::find('/'));
-		$this->assertEquals($rootMount, \OC\Files\Mount::find('/foo/bar'));
-
-		$storage = new Temporary(array());
-		$mount = new \OC\Files\Mount($storage, '/foo');
-		$this->assertEquals($rootMount, \OC\Files\Mount::find('/'));
-		$this->assertEquals($mount, \OC\Files\Mount::find('/foo/bar'));
-
-		$this->assertEquals(1, count(\OC\Files\Mount::findIn('/')));
-		new \OC\Files\Mount(new Temporary(array()), '/bar');
-		$this->assertEquals(2, count(\OC\Files\Mount::findIn('/')));
-
-		$id = $mount->getStorageId();
-		$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
-
-		$mount2 = new \OC\Files\Mount($storage, '/foo/bar');
-		$this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findByStorageId($id));
-	}
-
-	public function testLong() {
-		$storage = new LongId(array());
-		$mount = new \OC\Files\Mount($storage, '/foo');
-
-		$id = $mount->getStorageId();
-		$storageId = $storage->getId();
-		$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
-		$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($storageId));
-		$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId(md5($storageId)));
-	}
-}
diff --git a/tests/lib/files/mount/manager.php b/tests/lib/files/mount/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..154c35ccead2b7d94700de031712b548976711f4
--- /dev/null
+++ b/tests/lib/files/mount/manager.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Mount;
+
+use \OC\Files\Storage\Temporary;
+
+class LongId extends Temporary {
+	public function getId() {
+		return 'long:' . str_repeat('foo', 50) . parent::getId();
+	}
+}
+
+class Manager extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\Files\Mount\Manager
+	 */
+	private $manager;
+
+	public function setup() {
+		$this->manager = new \OC\Files\Mount\Manager();
+	}
+
+	public function testFind() {
+		$this->assertNull($this->manager->find('/'));
+
+		$rootMount = new \OC\Files\Mount\Mount(new Temporary(array()), '/');
+		$this->manager->addMount($rootMount);
+		$this->assertEquals($rootMount, $this->manager->find('/'));
+		$this->assertEquals($rootMount, $this->manager->find('/foo/bar'));
+
+		$storage = new Temporary(array());
+		$mount1 = new \OC\Files\Mount\Mount($storage, '/foo');
+		$this->manager->addMount($mount1);
+		$this->assertEquals($rootMount, $this->manager->find('/'));
+		$this->assertEquals($mount1, $this->manager->find('/foo/bar'));
+
+		$this->assertEquals(1, count($this->manager->findIn('/')));
+		$mount2 = new \OC\Files\Mount\Mount(new Temporary(array()), '/bar');
+		$this->manager->addMount($mount2);
+		$this->assertEquals(2, count($this->manager->findIn('/')));
+
+		$id = $mount1->getStorageId();
+		$this->assertEquals(array($mount1), $this->manager->findByStorageId($id));
+
+		$mount3 = new \OC\Files\Mount\Mount($storage, '/foo/bar');
+		$this->manager->addMount($mount3);
+		$this->assertEquals(array($mount1, $mount3), $this->manager->findByStorageId($id));
+	}
+
+	public function testLong() {
+		$storage = new LongId(array());
+		$mount = new \OC\Files\Mount\Mount($storage, '/foo');
+		$this->manager->addMount($mount);
+
+		$id = $mount->getStorageId();
+		$storageId = $storage->getId();
+		$this->assertEquals(array($mount), $this->manager->findByStorageId($id));
+		$this->assertEquals(array($mount), $this->manager->findByStorageId($storageId));
+		$this->assertEquals(array($mount), $this->manager->findByStorageId(md5($storageId)));
+	}
+}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index a064e44f3efdaea1850014f0193c1cf3145aa96c..01f9a9cca11966aeab52320319a31112131c8d9a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -7,6 +7,12 @@
 
 namespace Test\Files;
 
+class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
+	public function touch($path, $mtime = null) {
+		return false;
+	}
+}
+
 class View extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage[] $storages;
@@ -220,7 +226,7 @@ class View extends \PHPUnit_Framework_TestCase {
 		$cachedData = $rootView->getFileInfo('foo.txt');
 		$this->assertEquals(16, $cachedData['size']);
 
-		$rootView->putFileInfo('foo.txt', array('mtime' => 10));
+		$rootView->putFileInfo('foo.txt', array('storage_mtime' => 10));
 		$storage1->file_put_contents('foo.txt', 'foo');
 		clearstatcache();
 
@@ -228,12 +234,73 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3, $cachedData['size']);
 	}
 
+	function testCopyBetweenStorages() {
+		$storage1 = $this->getTestStorage();
+		$storage2 = $this->getTestStorage();
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
+
+		$rootView = new \OC\Files\View('');
+		$rootView->mkdir('substorage/emptyfolder');
+		$rootView->copy('substorage', 'anotherfolder');
+		$this->assertTrue($rootView->is_dir('/anotherfolder'));
+		$this->assertTrue($rootView->is_dir('/substorage'));
+		$this->assertTrue($rootView->is_dir('/anotherfolder/emptyfolder'));
+		$this->assertTrue($rootView->is_dir('/substorage/emptyfolder'));
+		$this->assertTrue($rootView->file_exists('/anotherfolder/foo.txt'));
+		$this->assertTrue($rootView->file_exists('/anotherfolder/foo.png'));
+		$this->assertTrue($rootView->file_exists('/anotherfolder/folder/bar.txt'));
+		$this->assertTrue($rootView->file_exists('/substorage/foo.txt'));
+		$this->assertTrue($rootView->file_exists('/substorage/foo.png'));
+		$this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt'));
+	}
+
+	function testMoveBetweenStorages() {
+		$storage1 = $this->getTestStorage();
+		$storage2 = $this->getTestStorage();
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		\OC\Files\Filesystem::mount($storage2, array(), '/substorage');
+
+		$rootView = new \OC\Files\View('');
+		$rootView->rename('foo.txt', 'substorage/folder/foo.txt');
+		$this->assertFalse($rootView->file_exists('foo.txt'));
+		$this->assertTrue($rootView->file_exists('substorage/folder/foo.txt'));
+		$rootView->rename('substorage/folder', 'anotherfolder');
+		$this->assertFalse($rootView->is_dir('substorage/folder'));
+		$this->assertTrue($rootView->file_exists('anotherfolder/foo.txt'));
+		$this->assertTrue($rootView->file_exists('anotherfolder/bar.txt'));
+	}
+
+	function testTouch() {
+		$storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch');
+
+		\OC\Files\Filesystem::mount($storage, array(), '/');
+
+		$rootView = new \OC\Files\View('');
+		$oldCachedData = $rootView->getFileInfo('foo.txt');
+
+		$rootView->touch('foo.txt', 500);
+
+		$cachedData = $rootView->getFileInfo('foo.txt');
+		$this->assertEquals(500, $cachedData['mtime']);
+		$this->assertEquals($oldCachedData['storage_mtime'], $cachedData['storage_mtime']);
+
+		$rootView->putFileInfo('foo.txt', array('storage_mtime' => 1000)); //make sure the watcher detects the change
+		$rootView->file_put_contents('foo.txt', 'asd');
+		$cachedData = $rootView->getFileInfo('foo.txt');
+		$this->assertGreaterThanOrEqual($cachedData['mtime'], $oldCachedData['mtime']);
+		$this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']);
+	}
+
 	/**
 	 * @param bool $scan
 	 * @return \OC\Files\Storage\Storage
 	 */
-	private function getTestStorage($scan = true) {
-		$storage = new \OC\Files\Storage\Temporary(array());
+	private function getTestStorage($scan = true, $class = '\OC\Files\Storage\Temporary') {
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 */
+		$storage = new $class(array());
 		$textData = "dummy file data\n";
 		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
 		$storage->mkdir('folder');
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..f48dc53c5635d1ae1cdf5ca36edcef96c5cfd09a
--- /dev/null
+++ b/tests/lib/hooks/basicemitter.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+
+/**
+ * Class DummyEmitter
+ *
+ * class to make BasicEmitter::emit publicly available
+ *
+ * @package Test\Hooks
+ */
+class DummyEmitter extends \OC\Hooks\BasicEmitter {
+	public function emitEvent($scope, $method, $arguments = array()) {
+		$this->emit($scope, $method, $arguments);
+	}
+}
+
+/**
+ * Class EmittedException
+ *
+ * a dummy exception so we can check if an event is emitted
+ *
+ * @package Test\Hooks
+ */
+class EmittedException extends \Exception {
+}
+
+class BasicEmitter extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\Hooks\Emitter $emitter
+	 */
+	protected $emitter;
+
+	public function setUp() {
+		$this->emitter = new DummyEmitter();
+	}
+
+	public function nonStaticCallBack() {
+		throw new EmittedException;
+	}
+
+	public static function staticCallBack() {
+		throw new EmittedException;
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testAnonymousFunction() {
+		$this->emitter->listen('Test', 'test', function () {
+			throw new EmittedException;
+		});
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testStaticCallback() {
+		$this->emitter->listen('Test', 'test', array('\Test\Hooks\BasicEmitter', 'staticCallBack'));
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testNonStaticCallback() {
+		$this->emitter->listen('Test', 'test', array($this, 'nonStaticCallBack'));
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	public function testOnlyCallOnce() {
+		$count = 0;
+		$listener = function () use (&$count) {
+			$count++;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->assertEquals(1, $count, 'Listener called an invalid number of times (' . $count . ') expected 1');
+	}
+
+	public function testDifferentMethods() {
+		$count = 0;
+		$listener = function () use (&$count) {
+			$count++;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Test', 'foo', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->emitter->emitEvent('Test', 'foo');
+		$this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+	}
+
+	public function testDifferentScopes() {
+		$count = 0;
+		$listener = function () use (&$count) {
+			$count++;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Bar', 'test', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->emitter->emitEvent('Bar', 'test');
+		$this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+	}
+
+	public function testDifferentCallbacks() {
+		$count = 0;
+		$listener1 = function () use (&$count) {
+			$count++;
+		};
+		$listener2 = function () use (&$count) {
+			$count++;
+		};
+		$this->emitter->listen('Test', 'test', $listener1);
+		$this->emitter->listen('Test', 'test', $listener2);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->assertEquals(2, $count, 'Listener called an invalid number of times (' . $count . ') expected 2');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testArguments() {
+		$this->emitter->listen('Test', 'test', function ($foo, $bar) {
+			if ($foo == 'foo' and $bar == 'bar') {
+				throw new EmittedException;
+			}
+		});
+		$this->emitter->emitEvent('Test', 'test', array('foo', 'bar'));
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testNamedArguments() {
+		$this->emitter->listen('Test', 'test', function ($foo, $bar) {
+			if ($foo == 'foo' and $bar == 'bar') {
+				throw new EmittedException;
+			}
+		});
+		$this->emitter->emitEvent('Test', 'test', array('foo' => 'foo', 'bar' => 'bar'));
+	}
+
+	public function testRemoveAllSpecified() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->removeListener('Test', 'test', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	public function testRemoveWildcardListener() {
+		$listener1 = function () {
+			throw new EmittedException;
+		};
+		$listener2 = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener1);
+		$this->emitter->listen('Test', 'test', $listener2);
+		$this->emitter->removeListener('Test', 'test');
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	public function testRemoveWildcardMethod() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Test', 'foo', $listener);
+		$this->emitter->removeListener('Test', null, $listener);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->emitter->emitEvent('Test', 'foo');
+	}
+
+	public function testRemoveWildcardScope() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Bar', 'test', $listener);
+		$this->emitter->removeListener(null, 'test', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->emitter->emitEvent('Bar', 'test');
+	}
+
+	public function testRemoveWildcardScopeAndMethod() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Test', 'foo', $listener);
+		$this->emitter->listen('Bar', 'foo', $listener);
+		$this->emitter->removeListener(null, null, $listener);
+		$this->emitter->emitEvent('Test', 'test');
+		$this->emitter->emitEvent('Test', 'foo');
+		$this->emitter->emitEvent('Bar', 'foo');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testRemoveKeepOtherCallback() {
+		$listener1 = function () {
+			throw new EmittedException;
+		};
+		$listener2 = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener1);
+		$this->emitter->listen('Test', 'test', $listener2);
+		$this->emitter->removeListener('Test', 'test', $listener1);
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testRemoveKeepOtherMethod() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Test', 'foo', $listener);
+		$this->emitter->removeListener('Test', 'foo', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testRemoveKeepOtherScope() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->listen('Bar', 'test', $listener);
+		$this->emitter->removeListener('Bar', 'test', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+	}
+
+	/**
+	 * @expectedException \Test\Hooks\EmittedException
+	 */
+	public function testRemoveNonExistingName() {
+		$listener = function () {
+			throw new EmittedException;
+		};
+		$this->emitter->listen('Test', 'test', $listener);
+		$this->emitter->removeListener('Bar', 'test', $listener);
+		$this->emitter->emitEvent('Test', 'test');
+	}
+}
diff --git a/tests/lib/hooks/legacyemitter.php b/tests/lib/hooks/legacyemitter.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7bed879a722959414bee8752688ceb0f0fcfeda
--- /dev/null
+++ b/tests/lib/hooks/legacyemitter.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Hooks;
+
+/**
+ * Class DummyLegacyEmitter
+ *
+ * class to make LegacyEmitter::emit publicly available
+ *
+ * @package Test\Hooks
+ */
+class DummyLegacyEmitter extends \OC\Hooks\LegacyEmitter {
+	public function emitEvent($scope, $method, $arguments = array()) {
+		$this->emit($scope, $method, $arguments);
+	}
+}
+
+class LegacyEmitter extends BasicEmitter {
+
+	//we can't use exceptions here since OC_Hooks catches all exceptions
+	private static $emitted = false;
+
+	public function setUp() {
+		$this->emitter = new DummyLegacyEmitter();
+		self::$emitted = false;
+		\OC_Hook::clear('Test','test');
+	}
+
+	public static function staticLegacyCallBack() {
+		self::$emitted = true;
+	}
+
+	public static function staticLegacyArgumentsCallBack($arguments) {
+		if ($arguments['foo'] == 'foo' and $arguments['bar'] == 'bar')
+			self::$emitted = true;
+	}
+
+	public function testLegacyHook() {
+		\OC_Hook::connect('Test', 'test', '\Test\Hooks\LegacyEmitter', 'staticLegacyCallBack');
+		$this->emitter->emitEvent('Test', 'test');
+		$this->assertEquals(true, self::$emitted);
+	}
+
+	public function testLegacyArguments() {
+		\OC_Hook::connect('Test', 'test', '\Test\Hooks\LegacyEmitter', 'staticLegacyArgumentsCallBack');
+		$this->emitter->emitEvent('Test', 'test', array('foo' => 'foo', 'bar' => 'bar'));
+		$this->assertEquals(true, self::$emitted);
+	}
+}
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index ce5d762226b540c0a7ba06d4536886dea40f3a68..d6008876a0042094d3e1b1bbd3aa87a7f86cff58 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -19,8 +19,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-OC::autoload('OCP\Contacts');
-
 class Test_Contacts extends PHPUnit_Framework_TestCase
 {
 
diff --git a/tests/lib/session/memory.php b/tests/lib/session/memory.php
new file mode 100644
index 0000000000000000000000000000000000000000..2dc236b73bfa0db751cd241692f0fdfe004b8104
--- /dev/null
+++ b/tests/lib/session/memory.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Session;
+
+class Memory extends Session {
+	public function setUp() {
+		$this->instance = new \OC\Session\Memory(uniqid());
+	}
+}
diff --git a/tests/lib/session/session.php b/tests/lib/session/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..72dee44e7cb14e4b35f096fba62428c612d52766
--- /dev/null
+++ b/tests/lib/session/session.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Session;
+
+abstract class Session extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\Session\Session
+	 */
+	protected $instance;
+
+	public function tearDown() {
+		$this->instance->clear();
+	}
+
+	public function testNotExistsEmpty() {
+		$this->assertFalse($this->instance->exists('foo'));
+	}
+
+	public function testExistsAfterSet() {
+		$this->instance->set('foo', 1);
+		$this->assertTrue($this->instance->exists('foo'));
+	}
+
+	public function testNotExistsAfterRemove() {
+		$this->instance->set('foo', 1);
+		$this->instance->remove('foo');
+		$this->assertFalse($this->instance->exists('foo'));
+	}
+
+	public function testGetNonExisting() {
+		$this->assertNull($this->instance->get('foo'));
+	}
+
+	public function testGetAfterSet() {
+		$this->instance->set('foo', 'bar');
+		$this->assertEquals('bar', $this->instance->get(('foo')));
+	}
+
+	public function testRemoveNonExisting() {
+		$this->instance->remove('foo');
+	}
+
+	public function testNotExistsAfterClear() {
+		$this->instance->set('foo', 1);
+		$this->instance->clear();
+		$this->assertFalse($this->instance->exists('foo'));
+	}
+
+	public function testArrayInterface() {
+		$this->assertFalse(isset($this->instance['foo']));
+		$this->instance['foo'] = 'bar';
+		$this->assertTrue(isset($this->instance['foo']));
+		$this->assertEquals('bar', $this->instance['foo']);
+		unset($this->instance['foo']);
+		$this->assertFalse(isset($this->instance['foo']));
+	}
+}
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 2237ee7d3781c61e72e1875002144a3803962561..c7e51ccfa48560c0f682b5e34198c70170eed0c8 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -77,10 +77,10 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 	}
 
 	public function testOC() {
-		\OC\Files\Mount::clear();
+		\OC\Files\Filesystem::clearMounts();
 		$storage = new \OC\Files\Storage\Temporary(array());
 		$storage->file_put_contents('foo.txt', 'asd');
-		new \OC\Files\Mount($storage, '/');
+		\OC\Files\Filesystem::mount($storage, array(), '/');
 
 		$this->assertTrue(file_exists('oc:///foo.txt'));
 		$this->assertEquals('asd', file_get_contents('oc:///foo.txt'));
diff --git a/tests/lib/template.php b/tests/lib/template.php
index 6e88d4c07fc0218479a19fd2696159169080f40a..fd12119da580aa5ed241a0784cdd4de389c27ae6 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -20,10 +20,13 @@
 *
 */
 
-OC::autoload('OC_Template');
-
 class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
 
+	public function setUp() {
+		$loader = new \OC\Autoloader();
+		$loader->load('OC_Template');
+	}
+
 	public function testP() {
 		// FIXME: do we need more testcases?
 		$htmlString = "<script>alert('xss');</script>";
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
new file mode 100644
index 0000000000000000000000000000000000000000..bc49f6db4b281e3c58b2d9051c923c06a04f1d30
--- /dev/null
+++ b/tests/lib/user/manager.php
@@ -0,0 +1,304 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\User;
+
+class Manager extends \PHPUnit_Framework_TestCase {
+	public function testUserExistsSingleBackendExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(true));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$this->assertTrue($manager->userExists('foo'));
+	}
+
+	public function testUserExistsSingleBackendNotExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(false));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$this->assertFalse($manager->userExists('foo'));
+	}
+
+	public function testUserExistsNoBackends() {
+		$manager = new \OC\User\Manager();
+
+		$this->assertFalse($manager->userExists('foo'));
+	}
+
+	public function testUserExistsTwoBackendsSecondExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 */
+		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(false));
+
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 */
+		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(true));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend1);
+		$manager->registerBackend($backend2);
+
+		$this->assertTrue($manager->userExists('foo'));
+	}
+
+	public function testUserExistsTwoBackendsFirstExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 */
+		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(true));
+
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 */
+		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2->expects($this->never())
+			->method('userExists');
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend1);
+		$manager->registerBackend($backend2);
+
+		$this->assertTrue($manager->userExists('foo'));
+	}
+
+	public function testGetOneBackendExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(true));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$this->assertEquals('foo', $manager->get('foo')->getUID());
+	}
+
+	public function testGetOneBackendNotExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(false));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$this->assertEquals(null, $manager->get('foo'));
+	}
+
+	public function testSearchOneBackend() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('getUsers')
+			->with($this->equalTo('fo'))
+			->will($this->returnValue(array('foo', 'afoo')));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$result = $manager->search('fo');
+		$this->assertEquals(2, count($result));
+		$this->assertEquals('afoo', $result[0]->getUID());
+		$this->assertEquals('foo', $result[1]->getUID());
+	}
+
+	public function testSearchTwoBackendLimitOffset() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 */
+		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1->expects($this->once())
+			->method('getUsers')
+			->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
+			->will($this->returnValue(array('foo1', 'foo2')));
+
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 */
+		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2->expects($this->once())
+			->method('getUsers')
+			->with($this->equalTo('fo'), $this->equalTo(1), $this->equalTo(0))
+			->will($this->returnValue(array('foo3')));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend1);
+		$manager->registerBackend($backend2);
+
+		$result = $manager->search('fo', 3, 1);
+		$this->assertEquals(3, count($result));
+		$this->assertEquals('foo1', $result[0]->getUID());
+		$this->assertEquals('foo2', $result[1]->getUID());
+		$this->assertEquals('foo3', $result[2]->getUID());
+	}
+
+	public function testCreateUserSingleBackendNotExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->once())
+			->method('createUser')
+			->with($this->equalTo('foo'), $this->equalTo('bar'));
+
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(false));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$user = $manager->createUser('foo', 'bar');
+		$this->assertEquals('foo', $user->getUID());
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testCreateUserSingleBackendExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend->expects($this->never())
+			->method('createUser');
+
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(true));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$manager->createUser('foo', 'bar');
+	}
+
+	public function testCreateUserSingleBackendNotSupported() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(false));
+
+		$backend->expects($this->never())
+			->method('createUser');
+
+		$backend->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(false));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$this->assertFalse($manager->createUser('foo', 'bar'));
+	}
+
+	public function testCreateUserNoBackends() {
+		$manager = new \OC\User\Manager();
+
+		$this->assertFalse($manager->createUser('foo', 'bar'));
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testCreateUserTwoBackendExists() {
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 */
+		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend1->expects($this->never())
+			->method('createUser');
+
+		$backend1->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(false));
+
+		/**
+		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 */
+		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(true));
+
+		$backend2->expects($this->never())
+			->method('createUser');
+
+		$backend2->expects($this->once())
+			->method('userExists')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue(true));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend1);
+		$manager->registerBackend($backend2);
+
+		$manager->createUser('foo', 'bar');
+	}
+}
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..274e9e2831eea8bce10721625458fb5d9f85a442
--- /dev/null
+++ b/tests/lib/user/session.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\User;
+
+class Session extends \PHPUnit_Framework_TestCase {
+	public function testGetUser() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->once())
+			->method('get')
+			->with('user_id')
+			->will($this->returnValue('foo'));
+
+		$backend = $this->getMock('OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('userExists')
+			->with('foo')
+			->will($this->returnValue(true));
+
+		$manager = new \OC\User\Manager();
+		$manager->registerBackend($backend);
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$user = $userSession->getUser();
+		$this->assertEquals('foo', $user->getUID());
+	}
+
+	public function testSetUser() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->once())
+			->method('set')
+			->with('user_id', 'foo');
+
+		$manager = $this->getMock('\OC\User\Manager');
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+		$user->expects($this->once())
+			->method('getUID')
+			->will($this->returnValue('foo'));
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$userSession->setUser($user);
+	}
+
+	public function testLoginValidPasswordEnabled() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->once())
+			->method('set')
+			->with('user_id', 'foo');
+
+		$manager = $this->getMock('\OC\User\Manager');
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+		$user->expects($this->once())
+			->method('checkPassword')
+			->with('bar')
+			->will($this->returnValue(true));
+		$user->expects($this->once())
+			->method('isEnabled')
+			->will($this->returnValue(true));
+		$user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('foo'));
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue($user));
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$userSession->login('foo', 'bar');
+		$this->assertEquals($user, $userSession->getUser());
+	}
+
+	public function testLoginValidPasswordDisabled() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->never())
+			->method('set');
+
+		$manager = $this->getMock('\OC\User\Manager');
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+		$user->expects($this->once())
+			->method('checkPassword')
+			->with('bar')
+			->will($this->returnValue(true));
+		$user->expects($this->once())
+			->method('isEnabled')
+			->will($this->returnValue(false));
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue($user));
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$userSession->login('foo', 'bar');
+	}
+
+	public function testLoginInValidPassword() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->never())
+			->method('set');
+
+		$manager = $this->getMock('\OC\User\Manager');
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+		$user->expects($this->once())
+			->method('checkPassword')
+			->with('bar')
+			->will($this->returnValue(false));
+		$user->expects($this->never())
+			->method('isEnabled');
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue($user));
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$userSession->login('foo', 'bar');
+	}
+
+	public function testLoginNonExisting() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->never())
+			->method('set');
+
+		$manager = $this->getMock('\OC\User\Manager');
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue(null));
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$userSession->login('foo', 'bar');
+	}
+}
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0d170cbfc56db3016e1859084d1dd8f6c64cdae
--- /dev/null
+++ b/tests/lib/user/user.php
@@ -0,0 +1,364 @@
+<?php
+
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\User;
+
+use OC\Hooks\PublicEmitter;
+
+class User extends \PHPUnit_Framework_TestCase {
+	public function testDisplayName() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Backend');
+		$backend->expects($this->once())
+			->method('getDisplayName')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue('Foo'));
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME))
+			->will($this->returnValue(true));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertEquals('Foo', $user->getDisplayName());
+	}
+
+	public function testDisplayNameNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Backend');
+		$backend->expects($this->never())
+			->method('getDisplayName');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME))
+			->will($this->returnValue(false));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertEquals('foo', $user->getDisplayName());
+	}
+
+	public function testSetPassword() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('setPassword')
+			->with($this->equalTo('foo'), $this->equalTo('bar'));
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_PASSWORD) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertTrue($user->setPassword('bar',''));
+	}
+
+	public function testSetPasswordNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->never())
+			->method('setPassword');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(false));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->setPassword('bar',''));
+	}
+
+	public function testDelete() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('deleteUser')
+			->with($this->equalTo('foo'));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertTrue($user->delete());
+	}
+
+	public function testCheckPassword() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('checkPassword')
+			->with($this->equalTo('foo'), $this->equalTo('bar'))
+			->will($this->returnValue(true));
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_CHECK_PASSWORD) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertTrue($user->checkPassword('bar'));
+	}
+
+	public function testCheckPasswordNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->never())
+			->method('checkPassword');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(false));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->checkPassword('bar'));
+	}
+
+	public function testGetHome() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('getHome')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue('/home/foo'));
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_GET_HOME) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertEquals('/home/foo', $user->getHome());
+	}
+
+	public function testGetHomeNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->never())
+			->method('getHome');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(false));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertEquals(\OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/foo', $user->getHome());
+	}
+
+	public function testCanChangePassword() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_PASSWORD) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertTrue($user->canChangePassword());
+	}
+
+	public function testCanChangePasswordNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(false));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->canChangePassword());
+	}
+
+	public function testCanChangeDisplayName() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertTrue($user->canChangeDisplayName());
+	}
+
+	public function testCanChangeDisplayNameNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnValue(false));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->canChangeDisplayName());
+	}
+
+	public function testSetDisplayNameSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Database');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$backend->expects($this->once())
+			->method('setDisplayName')
+			->with('foo','Foo');
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertTrue($user->setDisplayName('Foo'));
+		$this->assertEquals('Foo',$user->getDisplayName());
+	}
+
+	public function testSetDisplayNameNotSupported() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Database');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+					return false;
+			}));
+
+		$backend->expects($this->never())
+			->method('setDisplayName');
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->setDisplayName('Foo'));
+		$this->assertEquals('foo',$user->getDisplayName());
+	}
+
+	public function testSetPasswordHooks() {
+		$hooksCalled = 0;
+		$test = $this;
+
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('setPassword');
+
+		/**
+		 * @param \OC\User\User $user
+		 * @param string $password
+		 */
+		$hook = function ($user, $password) use ($test, &$hooksCalled) {
+			$hooksCalled++;
+			$test->assertEquals('foo', $user->getUID());
+			$test->assertEquals('bar', $password);
+		};
+
+		$emitter = new PublicEmitter();
+		$emitter->listen('\OC\User', 'preSetPassword', $hook);
+		$emitter->listen('\OC\User', 'postSetPassword', $hook);
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_PASSWORD) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend, $emitter);
+
+		$user->setPassword('bar','');
+		$this->assertEquals(2, $hooksCalled);
+	}
+
+	public function testDeleteHooks() {
+		$hooksCalled = 0;
+		$test = $this;
+
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Dummy');
+		$backend->expects($this->once())
+			->method('deleteUser');
+
+		/**
+		 * @param \OC\User\User $user
+		 */
+		$hook = function ($user) use ($test, &$hooksCalled) {
+			$hooksCalled++;
+			$test->assertEquals('foo', $user->getUID());
+		};
+
+		$emitter = new PublicEmitter();
+		$emitter->listen('\OC\User', 'preDelete', $hook);
+		$emitter->listen('\OC\User', 'postDelete', $hook);
+
+		$user = new \OC\User\User('foo', $backend, $emitter);
+		$this->assertTrue($user->delete());
+		$this->assertEquals(2, $hooksCalled);
+	}
+}
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index e79dd49870c89f33b5ef1f309b5a5cc41c5d4233..df5f600f20da3a479daacea277dbb8fe953498f9 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -81,6 +81,17 @@ class Test_VCategories extends PHPUnit_Framework_TestCase {
 
 	}
 
+	public function testrenameCategory() {
+		$defcategories = array('Friends', 'Family', 'Wrok', 'Other');
+		$catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
+
+		$this->assertTrue($catmgr->rename('Wrok', 'Work'));
+		$this->assertTrue($catmgr->hasCategory('Work'));
+		$this->assertFalse($catmgr->hasCategory('Wrok'));
+		$this->assertFalse($catmgr->rename('Wrok', 'Work'));
+
+	}
+
 	public function testAddToCategory() {
 		$objids = array(1, 2, 3, 4, 5, 6, 7, 8, 9);
 
diff --git a/tests/lib/vobject.php b/tests/lib/vobject.php
index 1103a4b3297084479b082bc42bb0e3f56e0bc881..f28d22a1fcdb3f0d4b4036348d23d339fc0742b6 100644
--- a/tests/lib/vobject.php
+++ b/tests/lib/vobject.php
@@ -10,10 +10,29 @@ class Test_VObject extends PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		Sabre\VObject\Property::$classMap['SUMMARY'] = 'OC\VObject\StringProperty';
+		Sabre\VObject\Property::$classMap['ORG'] = 'OC\VObject\CompoundProperty';
 	}
 
 	function testStringProperty() {
 		$property = Sabre\VObject\Property::create('SUMMARY', 'Escape;this,please');
 		$this->assertEquals("SUMMARY:Escape\;this\,please\r\n", $property->serialize());
 	}
+
+	function testCompoundProperty() {
+
+		$arr = array(
+			'ABC, Inc.',
+			'North American Division',
+			'Marketing;Sales',
+		);
+
+		$property = Sabre\VObject\Property::create('ORG');
+		$property->setParts($arr);
+
+		$this->assertEquals('ABC\, Inc.;North American Division;Marketing\;Sales', $property->value);
+		$this->assertEquals('ORG:ABC\, Inc.;North American Division;Marketing\;Sales' . "\r\n", $property->serialize());
+		$this->assertEquals(3, count($property->getParts()));
+		$parts = $property->getParts();
+		$this->assertEquals('Marketing;Sales', $parts[2]);
+	}
 }
\ No newline at end of file
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 23cd123edc67cabcf26882e400aca784144fd37d..e9ee7d8d70d2ee3153caac3fad25c7e48230a18e 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -5,10 +5,25 @@
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
-	<whitelist processUncoveredFilesFromWhitelist="true">
-		<directory suffix=".php">..</directory>
-		<exclude>
-			<directory suffix=".php">../3rdparty</directory>
-		</exclude>
-	</whitelist>
+	<filter>
+		<!-- whitelist processUncoveredFilesFromWhitelist="true" -->
+		<whitelist>
+			<directory suffix=".php">..</directory>
+			<exclude>
+				<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>
+			</exclude>
+		</whitelist>
+	</filter>
 </phpunit>
+
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index f5a686c3020688512d2dc84bd0094088f472c2ad..510c38a3c8bf3bfcf5f87c52b52ce34465df655d 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -5,12 +5,16 @@
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
-	<whitelist processUncoveredFilesFromWhitelist="true">
-		<directory suffix=".php">..</directory>
-		<exclude>
-			<directory suffix=".php">../3rdparty</directory>
-		</exclude>
-	</whitelist>
+	<filter>
+		<!-- whitelist processUncoveredFilesFromWhitelist="true" -->
+		<whitelist>
+			<directory suffix=".php">..</directory>
+			<exclude>
+				<directory suffix=".php">../3rdparty</directory>
+				<directory suffix=".php">../lib/MDB2</directory>
+			</exclude>
+		</whitelist>
+	</filter>
 	<listeners>
 		<listener class="PHPUnit_Util_Log_JSON"></listener>
 	</listeners>